diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-23 13:11:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-09-26 14:16:44 +0200 |
| commit | a63e28c0c56965a0120f250f5a39595c2f020356 (patch) | |
| tree | 9af466e826deb22108abf5b79cf83087af6d8542 /wizards | |
| parent | ee99b18850174be2d43120cc419af2b416a6bbdc (diff) | |
Resolves: tdf#99626 only the first queryTermination call in wizards works
cause the first call looks up the "queryTermination" method on the object
and replaces the object with that function, then calls on. Subsequent
calls then try to lookup "queryTermination" on "queryTermination".
Just pass queryTermination directly in the ctor (like all the other
wrappers do)
Change-Id: Ie042081c3c34e33b2f040d1ab1a33eeac4df9c3b
(cherry picked from commit 01889962cab8449e1d9682d22db0f6e1e28252fd)
Reviewed-on: https://gerrit.libreoffice.org/29230
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit a498e734f0954f401f430fd04c38e16ec7072489)
Diffstat (limited to 'wizards')
4 files changed, 3 insertions, 5 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py index ede7aaad640b..372dad0551e7 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py @@ -70,7 +70,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog): self.initializePaths() # initialize the agenda template - self.terminateListener = TerminateListenerProcAdapter(self) + self.terminateListener = TerminateListenerProcAdapter(self.queryTermination) self.myAgendaDoc = AgendaDocument( self.xMSF, self.agenda, self.resources, self.templateConsts, self.terminateListener) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 31ac74470508..ef60a2e790ac 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -65,7 +65,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.nMaxStep = 5 #instantiate The Document Frame for the Preview - self.terminateListener = TerminateListenerProcAdapter(self) + self.terminateListener = TerminateListenerProcAdapter(self.queryTermination) self.myFaxDoc = FaxDocument(xMSF, self.terminateListener) #create the dialog: diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py index dff56474b24f..7c460f7dee4c 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py @@ -72,7 +72,7 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.nMaxStep = 6 #instantiate The Document Frame for the Preview - self.terminateListener = TerminateListenerProcAdapter(self) + self.terminateListener = TerminateListenerProcAdapter(self.queryTermination) self.myLetterDoc = LetterDocument(xMSF, self.terminateListener) #create the dialog diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py b/wizards/com/sun/star/wizards/ui/event/CommonListener.py index ad15ac2d6c0f..94cafac672c2 100644 --- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py +++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py @@ -65,8 +65,6 @@ class TerminateListenerProcAdapter( unohelper.Base, XTerminateListener ): self.oProcToCall = oProcToCall def queryTermination(self, TerminateEvent): - self.oProcToCall = getattr(self.oProcToCall,"queryTermination") - if callable( self.oProcToCall ): self.oProcToCall() |