diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-07 14:44:16 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-07 18:06:21 +0300 |
| commit | 58fc0b1a14e827ab0b9ee4da8630c1e3ee10a19c (patch) | |
| tree | d651037324c7eefabe162d9e0faf9fdb2bf13d6f /fpicker | |
| parent | 94e95f7784aaaa969a536a63ae79f698a8c070a9 (diff) | |
Revert ""Fix" bnc#777788"
I will try to fix it in some other way that doesn't cause fdo#63622.
This reverts commit d639a5febe0df03d7af90d69eed816dcf856a551.
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 75a3f797f4de..655568508b76 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -668,6 +668,7 @@ 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) { @@ -694,7 +695,13 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest) if ( FAILED(hResult) ) return; - iDialog->SetFolder(pFolder); + if ( m_bInExecute || bForce ) + iDialog->SetFolder(pFolder); + else + { + // Use set default folder as Microsoft recommends in the IFileDialog documentation. + iDialog->SetDefaultFolder(pFolder); + } } void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest) |