From 3cbd5e620513da614b7d0ed44605cd14971cc236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 3 Mar 2014 13:28:43 +0000 Subject: [PATCH] Related: rhbz#1065807 wizards should look in Template_internal --- ...ook-for-templates-in-Template_intern.patch | 33 +++++++++++++++++++ libreoffice.spec | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-Wizards-should-look-for-templates-in-Template_intern.patch diff --git a/0001-Wizards-should-look-for-templates-in-Template_intern.patch b/0001-Wizards-should-look-for-templates-in-Template_intern.patch new file mode 100644 index 0000000..ed0ff40 --- /dev/null +++ b/0001-Wizards-should-look-for-templates-in-Template_intern.patch @@ -0,0 +1,33 @@ +From 97822e3cbc63d3bd110bc3c654b3fbb4d4d1904c Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Mon, 3 Mar 2014 11:57:34 +0100 +Subject: [PATCH] Wizards should look for templates in Template_internal, not + Template_user + +...as only the former reliably denotes the share/template tree where the +wizard templates are stored. (Presumably the latter defaulted to the former as +long as it wasn't explicitly set in the past, but is now always explicitly set +since 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2 "Resolves: rhbz#1065807 use xdg +~/Templates for default Template location.") + +Change-Id: I7d1ac47d821c778fe342865465d0505a94b824bf +--- + wizards/com/sun/star/wizards/ui/WizardDialog.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py +index 6cf9bc5..4e41fdf 100644 +--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py ++++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py +@@ -126,7 +126,7 @@ class WizardDialog(UnoDialog2): + xPropertySet = \ + self.xMSF.createInstance("com.sun.star.util.PathSettings") + self.sTemplatePath = \ +- xPropertySet.getPropertyValue("Template_user")[0] ++ xPropertySet.getPropertyValue("Template_internal")[0] + self.sUserTemplatePath = \ + xPropertySet.getPropertyValue("Template_writable") + +-- +1.8.5.3 + diff --git a/libreoffice.spec b/libreoffice.spec index f82640f..f5ff87c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -283,6 +283,7 @@ Patch20: 0001-rhbz-1057977-avoid-use-of-invalidated-pointers.patch Patch21: 0001-fdo-75540-setProcessServiceFactory-must-be-called-be.patch Patch22: 0001-KDE-don-t-throw-on-TemplatePathVariable.patch Patch23: 0001-Resolves-rhbz-1007697-Update-on-a-Window-triggering-.patch +Patch24: 0001-Wizards-should-look-for-templates-in-Template_intern.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2178,6 +2179,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Mar 03 2014 Caolán McNamara - 1:4.2.2.1-4 +- Related: rhbz#1065807 wizards should look in Template_internal + * Fri Feb 28 2014 Caolán McNamara - 1:4.2.2.1-3 - Resolves: rhbz#1007697 Update on a Window deletes itself