diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-26 09:01:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-26 09:07:40 +0300 |
| commit | ddbe7cd615689797ef8029c29a8eaeafd610ad09 (patch) | |
| tree | 3fbf5339590c9c5ae09dd82886b290c70607b0a3 | |
| parent | 075a5863050f3031b4aa33adb289d3380e009425 (diff) | |
fdo#63622: Revert '"Fix" bnc#777788'
Let's keep that "fix" just in the SUSE-specific branch.
This reverts commit 56d41fef8f96888d5aaf39a9c4d0c7eca5b63d44.
| -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) |