[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - fpicker/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 22 03:08:30 PST 2013
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 0822336d45e7f1bf23dca52f8945e22e37b577e8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Jan 22 13:01:44 2013 +0200
"Fix" bnc#777788
Always call IFileDialog::SetFolder() in
VistaFilePickerImpl::impl_sta_SetFileName() as that seems to be what
the customer wants.
Change-Id: I53807847d1d8f954caefe7d9e4b4e4807e6dcbfb
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index b7f8670..ad77c33 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)
More information about the Libreoffice-commits
mailing list