diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-01-22 13:01:44 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-02-05 13:40:05 +0100 |
| commit | d639a5febe0df03d7af90d69eed816dcf856a551 (patch) | |
| tree | 6e16b305f2cddb977bf484e5d494b5460d028a07 /fpicker | |
| parent | 7fea9d676296b380aa18a13d361f1c08957e5ec3 (diff) | |
"Fix" bnc#777788
Always call IFileDialog::SetFolder() in
VistaFilePickerImpl::impl_sta_SetFileName() as that seems to be what
the customer wants.
And overall, it is a more reasonable behavior.
Change-Id: I53807847d1d8f954caefe7d9e4b4e4807e6dcbfb
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 655568508b76..75a3f797f4de 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -668,7 +668,6 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest) void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest) { ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString()); - bool bForce = rRequest->getArgumentOrDefault(PROP_FORCE, false); if( !m_bInExecute) { @@ -695,13 +694,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest) if ( FAILED(hResult) ) return; - if ( m_bInExecute || bForce ) - iDialog->SetFolder(pFolder); - else - { - // Use set default folder as Microsoft recommends in the IFileDialog documentation. - iDialog->SetDefaultFolder(pFolder); - } + iDialog->SetFolder(pFolder); } void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest) |