rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: rhbz#1065807 wizards should find the right wizards subdir

Browse Source
This commit is contained in:
Caolán McNamara 2014-03-04 13:35:35 +00:00
parent 3cbd5e6205
commit 0027d5f05f
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
0001-actively-search-for-wizards-dir-in-all-internal-temp.patch Normal file
View File

@ -0,0 +1,59 @@
From 5fa18dc21644f2a719bf39ec948a586fa8837b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 4 Mar 2014 13:31:41 +0000
Subject: [PATCH] actively search for wizards dir in all internal templates
Change-Id: I4ef6da4d9d1931917e0aaa6e110fd273bd917b26
---
.../com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 2 +-
wizards/com/sun/star/wizards/ui/WizardDialog.py | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index 76866e7..d8598ff 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -752,7 +752,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
return None
def initializeTemplates(self, xMSF):
- sLetterPath = self.sTemplatePath + "/../common/wizard/letter"
+ sLetterPath = self.sTemplatePath + "/wizard/letter"
self.BusinessFiles = \
FileAccess.getFolderTitles(
xMSF, "bus", sLetterPath, self.resources.dictBusinessTemplate)
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index 4e41fdf..e107c63 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -22,6 +22,7 @@ from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \
ItemListenerProcAdapter
from ..common.Resource import Resource
from ..common.HelpIds import HelpIds
+from ..common.FileAccess import FileAccess
from com.sun.star.lang import NoSuchMethodException
from com.sun.star.frame import TerminationVetoException
@@ -125,10 +126,17 @@ class WizardDialog(UnoDialog2):
def initializePaths(self):
xPropertySet = \
self.xMSF.createInstance("com.sun.star.util.PathSettings")
- self.sTemplatePath = \
- xPropertySet.getPropertyValue("Template_internal")[0]
self.sUserTemplatePath = \
xPropertySet.getPropertyValue("Template_writable")
+ myFA = FileAccess(self.xMSF)
+ aInternalPaths = xPropertySet.getPropertyValue("Template_internal")
+ self.sTemplatePath = ""
+ for path in aInternalPaths:
+ if myFA.exists(path + "/wizard", False):
+ self.sTemplatePath = path
+ break
+ if self.sTemplatePath == "":
+ raise Exception("could not find wizard templates")
def addRoadmap(self):
try:
--
1.8.5.3

5
libreoffice.spec
View File

@ -284,6 +284,7 @@ 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
Patch25: 0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2179,6 +2180,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Tue Mar 04 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.2.1-5
- Related: rhbz#1065807 wizards should find the right wizards subdir
of Template_internal, who knew this stuff was so fragile
* Mon Mar 03 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.2.2.1-4
- Related: rhbz#1065807 wizards should look in Template_internal