diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-01-22 13:01:44 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-01-22 13:07:36 +0200 |
| commit | 0822336d45e7f1bf23dca52f8945e22e37b577e8 (patch) | |
| tree | 7f8ec2b00e74407e95bf76e2305fb973e117a88f /fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | |
| parent | f258496e5ae4cc08a56db5b9a659f47591ea1d6a (diff) | |
"Fix" bnc#777788
Always call IFileDialog::SetFolder() in
VistaFilePickerImpl::impl_sta_SetFileName() as that seems to be what
the customer wants.
Change-Id: I53807847d1d8f954caefe7d9e4b4e4807e6dcbfb
Diffstat (limited to 'fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx')
| -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 b7f86708b806..ad77c3367dfc 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -687,7 +687,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) { @@ -714,13 +713,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) |