wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 2 +- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 2 +- wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 2 +- wizards/com/sun/star/wizards/ui/event/CommonListener.py | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 01889962cab8449e1d9682d22db0f6e1e28252fd Author: Caolán McNamara <caol...@redhat.com> Date: Fri Sep 23 13:11:54 2016 +0100 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 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py index ede7aaa..372dad0 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 31ac744..ef60a2e 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 dff5647..7c460f7 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 ad15ac2..94cafac 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()
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits