diff options
| author | Jean-Pierre Ledure <jp@ledure.be> | 2022-07-21 12:40:15 +0200 |
|---|---|---|
| committer | Jean-Pierre Ledure <jp@ledure.be> | 2022-07-21 14:53:30 +0200 |
| commit | cd8ab93d9b84ed34d18334e07e1e11bd1728e161 (patch) | |
| tree | f9637c5ed59cb2c956c85654bab92e1271898a91 /wizards/source | |
| parent | f570de5df5a51a593e5fe361bbd79fa5cd6d8173 (diff) | |
ScriptForge - tdf#149983 dialog.Execute() failure
(patch https://gerrit.libreoffice.org/c/core/+/137084 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)
Change-Id: Ia12fccbb61362768301df6670161f258b32d3a78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137289
Tested-by: Jean-Pierre Ledure <jp@ledure.be>
Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>
Tested-by: Jenkins
Diffstat (limited to 'wizards/source')
| -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 6ad4720e6686..6d944d1460aa 100644 --- a/wizards/source/scriptforge/python/scriptforge.py +++ b/wizards/source/scriptforge/python/scriptforge.py @@ -1802,7 +1802,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 |