[libreoffice/f19] fix patch to apply
Caolán McNamara
caolanm at fedoraproject.org
Tue Mar 4 15:00:08 UTC 2014
commit d0b49fae5784c948b5636dab1d81f105add79970
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 4 14:59:01 2014 +0000
fix patch to apply
...arch-for-wizards-dir-in-all-internal-temp.patch | 32 +++++--------------
1 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/0001-actively-search-for-wizards-dir-in-all-internal-temp.patch b/0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
index 600a030..a7366e5 100644
--- a/0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
+++ b/0001-actively-search-for-wizards-dir-in-all-internal-temp.patch
@@ -1,40 +1,26 @@
-From 5fa18dc21644f2a719bf39ec948a586fa8837b6a Mon Sep 17 00:00:00 2001
+From 63c568821277e16db6b972b58b57c50d809df416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at 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(-)
+ wizards/com/sun/star/wizards/ui/WizardDialog.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 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
+index 239644b..08a8c2d 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
+@@ -23,6 +23,7 @@ from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \
+ from .event.CommonListener import TerminateListenerProcAdapter
from ..common.Resource import Resource
from ..common.HelpIds import HelpIds
+from ..common.FileAccess import FileAccess
+ from ..document.OfficeDocument import OfficeDocument
+ from ..text.TextDocument import TextDocument
- from com.sun.star.lang import NoSuchMethodException
- from com.sun.star.frame import TerminationVetoException
-@@ -125,10 +126,17 @@ class WizardDialog(UnoDialog2):
+@@ -114,10 +115,17 @@ class WizardDialog(UnoDialog2):
def initializePaths(self):
xPropertySet = \
self.xMSF.createInstance("com.sun.star.util.PathSettings")
More information about the scm-commits
mailing list