diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-26 08:45:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-26 08:45:27 +0300 |
| commit | 3b032a3ef1aeb520fe9b9e6a65dc4fcedff13f2b (patch) | |
| tree | f28d2b010dee8ccb521fc5e7f3c29f84b411818b | |
| parent | 9d97a2af7cd4d51fbf4dc3027f82cb6c7fc8328d (diff) | |
fdo#63622: Revert '"Fix" bnc#777788'
Let's keep that "fix" just in the SUSE-specific branch.
This reverts commit 56d41fef8f96888d5aaf39a9c4d0c7eca5b63d44.
Conflicts:
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
Change-Id: If331c6ec8978923e8e8bc6653bd27b5a9edaf2d7
| -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 971955314bfc..0ebea7c095d7 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) { OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, 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) |