Kaydet (Commit) 3b032a3e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

fdo#63622: Revert '"Fix" bnc#777788'

Let's keep that "fix" just in the SUSE-specific branch.

This reverts commit 56d41fef.

Conflicts:
	fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx

Change-Id: If331c6ec8978923e8e8bc6653bd27b5a9edaf2d7
üst 9d97a2af
...@@ -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)
{ {
OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString()); OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, 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