fpicker/source/generic/fpicker.cxx | 3 ++- fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 877de645ffb45b8446d9195996d1a56a8a89e64b Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed Oct 5 18:01:50 2011 +0300 WaE: unreachable code diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index bb38287..1444fde 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -67,6 +67,8 @@ static OUString FilePicker_getSystemPickerServiceName() return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker")); else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("macosx")) return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFilePicker")); + else + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFilePicker")); #endif #ifdef WNT if (SvtMiscOptions().TryODMADialog() && ::odma::DMSsAvailable()) { @@ -74,7 +76,6 @@ static OUString FilePicker_getSystemPickerServiceName() } return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.Win32FilePicker")); #endif - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFilePicker")); } static Reference< css::uno::XInterface > FilePicker_createInstance ( commit 8d6030fa420cb999572b0770fb52442e1b5b8190 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed Oct 5 17:56:09 2011 +0300 Use OUString::getStr() diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 0e0a3ff..17af330 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -709,7 +709,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest) #ifdef __MINGW32__ HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(sDirectory.getStr()), NULL, IID_IShellItem, (void**)(&pFolder) ); #else - HRESULT hResult = SHCreateItemFromParsingName ( sDirectory, NULL, IID_PPV_ARGS(&pFolder) ); + HRESULT hResult = SHCreateItemFromParsingName ( sDirectory.getStr(), NULL, IID_PPV_ARGS(&pFolder) ); #endif if ( FAILED(hResult) ) return; @@ -902,7 +902,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest) #ifdef __MINGW32__ HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(m_sDirectory.getStr()), NULL, IID_IShellItem, (void**)(&pFolder) ); #else - HRESULT hResult = SHCreateItemFromParsingName ( m_sDirectory, NULL, IID_PPV_ARGS(&pFolder) ); + HRESULT hResult = SHCreateItemFromParsingName ( m_sDirectory.getStr(), NULL, IID_PPV_ARGS(&pFolder) ); #endif if ( SUCCEEDED(hResult) ) { _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits