diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2022-07-21 14:59:35 +0200 |
|---|---|---|
| committer | Rafael Lima <rafael.palma.lima@gmail.com> | 2022-07-21 16:20:32 +0200 |
| commit | d1e09ee551b18eedb46c2bb4bc5cd175b94bcd93 (patch) | |
| tree | 2f11a2b71db1d761850598c128a41f60ff11c9a4 /wizards | |
| parent | 3b74fc4419cdf066b4cbf770df84e2a1209ad072 (diff) | |
ScriptForge - tdf#149983 dialog.Execute() failure
(patch https://gerrit.libreoffice.org/c/core/+/137113 cont'd)
In SF_PythonHelper._PythonDispatcher():
Force a hardcoded call of the methods in the Dialog
service which may potentially be invoked while the
dialog is displayed, bypassing the generic CallByName()
Basic builtin function:
Activate
Center
EndExecute
Resize
Execute => was missing in the list
Case when a parent dialog opens a child dialog
(Controls is already hardcoded because returning an array)
cfr.commit on master https://gerrit.libreoffice.org/c/core/+/137289
Change-Id: Ia54f2f0a45a212f6d8f35879a1ea92f68db35111
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137301
Tested-by: Jenkins
Reviewed-by: Rafael Lima <rafael.palma.lima@gmail.com>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/scriptforge/SF_PythonHelper.xba | 1 | ||||
| -rw-r--r-- | wizards/source/scriptforge/python/scriptforge.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/wizards/source/scriptforge/SF_PythonHelper.xba b/wizards/source/scriptforge/SF_PythonHelper.xba index 178dfcc09749..99d9f86c610c 100644 --- a/wizards/source/scriptforge/SF_PythonHelper.xba +++ b/wizards/source/scriptforge/SF_PythonHelper.xba @@ -826,6 +826,7 @@ Try: Case "Center" If UBound(vArgs) < 0 Then vReturn = vBasicObject.Center() Else vReturn = vBasicObject.Center(vArgs(0)) Case "EndExecute" : vReturn = vBasicObject.EndExecute(vArgs(0)) + Case "Execute" : vReturn = vBasicObject.Execute(vArgs(0)) Case "Resize" : vReturn = vBasicObject.Resize(vArgs(0), vArgs(1), vArgs(2), vArgs(3)) End Select End Select diff --git a/wizards/source/scriptforge/python/scriptforge.py b/wizards/source/scriptforge/python/scriptforge.py index 003abfb9b2ee..ebc6f147c114 100644 --- a/wizards/source/scriptforge/python/scriptforge.py +++ b/wizards/source/scriptforge/python/scriptforge.py @@ -1799,7 +1799,7 @@ class SFDialogs: return self.ExecMethod(self.vbMethod + self.flgHardCode, 'EndExecute', returnvalue) def Execute(self, modal = True): - return self.ExecMethod(self.vbMethod, 'Execute', modal) + return self.ExecMethod(self.vbMethod + self.flgHardCode, 'Execute', modal) def GetTextsFromL10N(self, l10n): l10nobj = l10n.objectreference if isinstance(l10n, SFScriptForge.SF_L10N) else l10n |