[Libreoffice-commits] core.git: wizards/source

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/scriptforge/SF_FileSystem.xba |    4 ++++
 wizards/source/scriptforge/SF_Utils.xba      |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 9c60996fc2a536803d016d6f60f879f8a1e49a54
Author:     Jean-Pierre Ledure <j...@ledure.be>
AuthorDate: Tue Apr 11 17:21:48 2023 +0200
Commit:     Jean-Pierre Ledure <j...@ledure.be>
CommitDate: Tue Apr 11 18:59:39 2023 +0200

    ScriptForge - (SF_FileSystem) tdf#154462 2nd call of PickFile() fails
    
    Error happens in gen and gtk3 modes.
    Does not happen in kf5 mode.
    
    Linux only. Windows OK.
    
    Change-Id: Ia5dd21f6879c1a732d291d15d6fb9f4bf20c76e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150238
    Tested-by: Jean-Pierre Ledure <j...@ledure.be>
    Reviewed-by: Jean-Pierre Ledure <j...@ledure.be>
    Tested-by: Jenkins

diff --git a/wizards/source/scriptforge/SF_FileSystem.xba 
b/wizards/source/scriptforge/SF_FileSystem.xba
index 21464c708fe5..b09f980429f4 100644
--- a/wizards/source/scriptforge/SF_FileSystem.xba
+++ b/wizards/source/scriptforge/SF_FileSystem.xba
@@ -1588,6 +1588,10 @@ Try:
                &apos; Get selected file
                iAccept = .Execute()
                If iAccept = com.sun.star.ui.dialogs.ExecutableDialogResults.OK 
Then sFile = .getSelectedFiles()(0)
+
+               &apos;  Do not reuse a FilePicker, side effects observed (a.o. 
TDF#154462)
+               .dispose()
+
        End With
 
 Finally:
diff --git a/wizards/source/scriptforge/SF_Utils.xba 
b/wizards/source/scriptforge/SF_Utils.xba
index c19f815587ce..11753704c461 100644
--- a/wizards/source/scriptforge/SF_Utils.xba
+++ b/wizards/source/scriptforge/SF_Utils.xba
@@ -370,9 +370,7 @@ Dim oDefaultContext As Object
                                End If
                                Set _GetUNOService = .FileAccess
                        Case &quot;FilePicker&quot;
-                               If IsEmpty(.FilePicker) Or IsNull(.FilePicker) 
Then
-                                       Set .FilePicker = 
CreateUnoService(&quot;com.sun.star.ui.dialogs.FilePicker&quot;)
-                               End If
+                               Set .FilePicker = 
CreateUnoService(&quot;com.sun.star.ui.dialogs.FilePicker&quot;)      &apos;  
Do not reuse an existing FilePicker: TDF#154462
                                Set _GetUNOService = .FilePicker
                        Case &quot;FilterFactory&quot;
                                If IsEmpty(.FilterFactory) Or 
IsNull(.FilterFactory) Then