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

[Caolán McNamara (via logerrit)]

 fpicker/source/win32/VistaFilePicker.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 4b366aa7b21318c2dcb84e1014c59b49ed155b9a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 22 19:47:31 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 23 09:59:58 2021 +0200

    Resolves: tdf#143993 don't change FolderPicker to FilePicker if init called
    
    make SIMPLE continue to map to E_CREATE_OPEN_DIALOG for a file dialog but
    map to E_CREATE_FOLDER_PICKER for a folder dialog
    
    Change-Id: I37b0cc318a06b1b16fae3c3dd99def4322f771f2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120853
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/fpicker/source/win32/VistaFilePicker.cxx 
b/fpicker/source/win32/VistaFilePicker.cxx
index 0c360f1bc33d..dbd50307391c 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -462,7 +462,12 @@ void SAL_CALL VistaFilePicker::initialize(const 
css::uno::Sequence< css::uno::An
     }
     Request rRequest;
     if (bFileOpenDialog)
-        rRequest.setRequest (VistaFilePickerImpl::E_CREATE_OPEN_DIALOG);
+    {
+        if (!m_bFolderPicker)
+            rRequest.setRequest(VistaFilePickerImpl::E_CREATE_OPEN_DIALOG);
+        else
+            rRequest.setRequest(VistaFilePickerImpl::E_CREATE_FOLDER_PICKER);
+    }
     else
         rRequest.setRequest (VistaFilePickerImpl::E_CREATE_SAVE_DIALOG);
     rRequest.setArgument(PROP_FEATURES, nFeatures);