fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
New commits: commit d639a5febe0df03d7af90d69eed816dcf856a551 Author: Tor Lillqvist <[email protected]> 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. And overall, it is a more reasonable behavior. Change-Id: I53807847d1d8f954caefe7d9e4b4e4807e6dcbfb Signed-off-by: Jan Holesovsky <[email protected]> diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 6555685..75a3f79 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -668,7 +668,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) { @@ -695,13 +694,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) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
