Kaydet (Commit) 58fc0b1a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Revert ""Fix" bnc#777788"

I will try to fix it in some other way that doesn't cause fdo#63622.

This reverts commit d639a5fe.
üst 94e95f77
...@@ -668,6 +668,7 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest) ...@@ -668,6 +668,7 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest) void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)
{ {
::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString()); ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString());
bool bForce = rRequest->getArgumentOrDefault(PROP_FORCE, false);
if( !m_bInExecute) if( !m_bInExecute)
{ {
...@@ -694,7 +695,13 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest) ...@@ -694,7 +695,13 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)
if ( FAILED(hResult) ) if ( FAILED(hResult) )
return; 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) void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment