diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-22 19:47:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-23 09:59:58 +0200 |
| commit | 4b366aa7b21318c2dcb84e1014c59b49ed155b9a (patch) | |
| tree | 4e1df21de346dbe58137a04d62d6d3e7c0dcff6a /fpicker | |
| parent | 3527b4e4cfa23c3459c53b091ddadd93c426d0c3 (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/VistaFilePicker.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
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); |