[Libreoffice-commits] .: fpicker/source
fpicker/source/office/iodlgimp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 729165ebacc6ff8bd1e5c936252cdace1782824b Author: Stephan Bergmann Date: Tue Apr 24 10:43:44 2012 +0200 OSL_DEBUG_LEVEL > 0 -> defined DBG_UTIL diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 99797da..c815840 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -340,7 +340,7 @@ void SvtExpFileDlg_Impl::SetStandardDir( const String& _rDir ) } //* -#if OSL_DEBUG_LEVEL > 0 +#if defined DBG_UTIL //- namespace { String lcl_DecoratedFilter( const String& _rOriginalFilter ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |8 +++- fpicker/source/win32/filepicker/vistatypes.h |8 +++- 2 files changed, 14 insertions(+), 2 deletions(-) New commits: commit ea822495b776a8b0b9d6b99299fdbc7bfc8db340 Author: Thomas Arnhold Date: Sat Apr 21 13:26:30 2012 +0200 Partially revert: "Replace css macro with namespace for nicer namespacing" To fix the build. I can't test it on win32, thought it would work... diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index ca1b223..47909d7 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -45,7 +45,11 @@ // namespace //- -namespace css = ::com::sun::star; +#ifdef css +#error "Clash on using CSS as namespace define." +#else +#define css ::com::sun::star +#endif namespace fpicker{ namespace win32{ @@ -69,6 +73,8 @@ class IVistaFilePickerInternalNotify }}} +#undef css + #endif // FPICKER_WIN32_VISTA_FILEPICKER_INTERNALNOTIFY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h index e1b1fc5..08b4613 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -40,7 +40,11 @@ // namespace //- -namespace css = ::com::sun::star; +#ifdef css +#error "Clash on using CSS as namespace define." +#else +#define css ::com::sun::star +#endif namespace fpicker{ namespace win32{ @@ -60,6 +64,8 @@ typedef ComPtr< IFileDialogCustomize, IID_IFileDialogCustomize } // namespace win32 } // namespace fpicker +#undef css + #endif // FPICKER_WIN32_VISTA_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/office/iodlg.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit ee0f84f18071bc6cb8381e590c28dad9a0122625 Author: Stephan Bergmann Date: Tue Apr 10 14:11:22 2012 +0200 fdo#48496 Decode file URL path segment dispalyed as "place" name diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index af9dfed..ce350e0 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1436,7 +1436,8 @@ IMPL_STATIC_LINK ( SvtFileDialog, AddPlacePressed_Hdl, void*, EMPTYARG ) // Maybe open the PlacesDialog would have been a better idea // there is an ux choice to make we did not make... INetURLObject aURLObj( pThis->_pFileView->GetViewURL() ); -PlacePtr newPlace(new Place( aURLObj.GetLastName(), +PlacePtr newPlace( +new Place( aURLObj.GetLastName(INetURLObject::DECODE_WITH_CHARSET), ::rtl::OUString(pThis->_pFileView->GetViewURL()), true)); pThis->_pImp->_pPlaces->AppendPlace(newPlace); return 0; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/filepicker/FPentry.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit d5e83535a5ab32dc0730e6edab116855875bfa74 Author: David Tardon Date: Thu Mar 15 10:28:07 2012 +0100 error: 'XFolderPicker' was not declared in this scope diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 0242171..3c1e0c0 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -59,6 +59,7 @@ using namespace ::com::sun::star::registry ; using namespace ::cppu ; using ::com::sun::star::ui::dialogs::XFilePicker; using ::com::sun::star::ui::dialogs::XFilePicker2; +using ::com::sun::star::ui::dialogs::XFolderPicker; // // ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source vcl/inc
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 15 --- vcl/inc/vcl/settings.hxx | 26 +- 2 files changed, 13 insertions(+), 28 deletions(-) New commits: commit 77ee92a6bd8f40022ab03325d158de4b67a41dd0 Author: LuboÅ¡ LuÅák Date: Fri Mar 9 15:50:17 2012 +0100 change vcl's SETTINGS_* #define's to const int They pollute not only the global namespace, but all namespaces, given they're are #define's. I bet they'd eventually all conflict with the namespaced enum in kdelibs headers. diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 8e8b3e8..d8df515 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -55,14 +55,6 @@ /* * Hack, but needed because of conflicting types... */ #define Region QtXRegion -//kde has an enum that uses this...OO does too -#define LO_SETTINGS_MOUSE SETTINGS_MOUSE -#undef SETTINGS_MOUSE -#define LO_SETTINGS_LOCALE SETTINGS_LOCALE -#undef SETTINGS_LOCALE -#define LO_SETTINGS_STYLE SETTINGS_STYLE -#undef SETTINGS_STYLE - #include #include #include @@ -75,13 +67,6 @@ #undef Region -#define SETTINGS_MOUSE LO_SETTINGS_MOUSE -#undef LO_SETTINGS_MOUSE -#define SETTINGS_LOCALE LO_SETTINGS_LOCALE -#undef LO_SETTINGS_LOCALE -#define SETTINGS_STYLE LO_SETTINGS_STYLE -#undef LO_SETTINGS_STYLE - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 2f333ca..f69f91f 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -990,19 +990,19 @@ private: // - AllSettings - // --- -#define SETTINGS_MOUSE ((sal_uLong)0x0001) -#define SETTINGS_STYLE ((sal_uLong)0x0002) -#define SETTINGS_MISC ((sal_uLong)0x0004) -#define SETTINGS_SOUND ((sal_uLong)0x0008) -#define SETTINGS_HELP ((sal_uLong)0x0010) -#define SETTINGS_LOCALE ((sal_uLong)0x0020) -#define SETTINGS_UILOCALE ((sal_uLong)0x0040) -#define SETTINGS_ALLSETTINGS(SETTINGS_MOUSE |\ - SETTINGS_STYLE | SETTINGS_MISC |\ - SETTINGS_SOUND |\ - SETTINGS_HELP |\ - SETTINGS_LOCALE | SETTINGS_UILOCALE ) -#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uLong)0x0800) // this flag indicates that the data changed event was created +const int SETTINGS_MOUSE = 0x0001; +const int SETTINGS_STYLE = 0x0002; +const int SETTINGS_MISC = 0x0004; +const int SETTINGS_SOUND = 0x0008; +const int SETTINGS_HELP = 0x0010; +const int SETTINGS_LOCALE = 0x0020; +const int SETTINGS_UILOCALE = 0x0040; +const int SETTINGS_ALLSETTINGS = ( SETTINGS_MOUSE | + SETTINGS_STYLE | SETTINGS_MISC | + SETTINGS_SOUND | + SETTINGS_HELP | + SETTINGS_LOCALE | SETTINGS_UILOCALE ); +const int SETTINGS_IN_UPDATE_SETTINGS = 0x0800; // this flag indicates that the data changed event was created // in Windows::UpdateSettings probably because of a global // settings changed ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/unx/kde4/KDE4FilePicker.cxx |4 1 file changed, 4 insertions(+) New commits: commit ee67c55260ec7723c39606955ccdbd3e2934935a Author: David Tardon Date: Thu Mar 8 14:15:09 2012 +0100 yet another clash with macro name diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 269deee..8e8b3e8 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -60,6 +60,8 @@ #undef SETTINGS_MOUSE #define LO_SETTINGS_LOCALE SETTINGS_LOCALE #undef SETTINGS_LOCALE +#define LO_SETTINGS_STYLE SETTINGS_STYLE +#undef SETTINGS_STYLE #include #include @@ -77,6 +79,8 @@ #undef LO_SETTINGS_MOUSE #define SETTINGS_LOCALE LO_SETTINGS_LOCALE #undef LO_SETTINGS_LOCALE +#define SETTINGS_STYLE LO_SETTINGS_STYLE +#undef LO_SETTINGS_STYLE using namespace ::com::sun::star; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/misc/resourceprovider.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 9133fd623f2271da92a8a9f905f4c9c61a3de956 Author: Stephan Bergmann Date: Thu Feb 23 18:03:13 2012 +0100 Rewrite fix to use the same SimpleResMgr ctor as it did before ...as the two actually behave subtly differently. diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index f288f7a..629d195 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -120,9 +120,8 @@ public: CResourceProvider_Impl( ) { const SolarMutexGuard aGuard; - -com::sun::star::lang::Locale aLoc( Application::GetSettings().GetUILocale() ); -m_ResMgr = new SimpleResMgr( OUString( "fps_office" ), aLoc ); +m_ResMgr = new SimpleResMgr( +"fps_office", Application::GetSettings().GetUILocale()); } //- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/misc/resourceprovider.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 18339dbc452d6e074ed4e94cc47db1249600a48d Author: Matus Kukan Date: Thu Feb 23 08:07:15 2012 +0100 fix build on Windows: use OUString diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index e3a97cc..f288f7a 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -122,7 +122,7 @@ public: const SolarMutexGuard aGuard; com::sun::star::lang::Locale aLoc( Application::GetSettings().GetUILocale() ); -m_ResMgr = new SimpleResMgr( CREATEVERSIONRESMGR_NAME( fps_office ), aLoc ); +m_ResMgr = new SimpleResMgr( OUString( "fps_office" ), aLoc ); } //- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/filepicker/asynceventnotifier.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b7a0b9e51918fb0de2ec290f90178d36e4761f67 Author: Mariusz Dykierek Date: Fri Feb 17 15:15:44 2012 + Possible inefficient checking for 'm_EventList' emptiness. diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index a155f8b..748e5ac 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -240,7 +240,7 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize() void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() { osl::MutexGuard aGuard(m_Mutex); -if (0 == m_EventList.size()) +if ( m_EventList.empty() ) ResetEvent(m_NotifyEvent); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/unx/kde4/KDE4FilePicker.cxx |8 1 file changed, 8 insertions(+) New commits: commit 0d7e2108425da1f81c20a605145679168486df59 Author: LuboÅ¡ LuÅák Date: Fri Jan 6 10:55:03 2012 +0100 workaround for LO namespace pollution breaking KDE4 fpicker build diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index f282645..69be3b1 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -56,7 +56,10 @@ #define Region QtXRegion //kde has an enum that uses this...OO does too +#define LO_SETTINGS_MOUSE SETTINGS_MOUSE #undef SETTINGS_MOUSE +#define LO_SETTINGS_LOCALE SETTINGS_LOCALE +#undef SETTINGS_LOCALE #include #include @@ -70,6 +73,11 @@ #undef Region +#define SETTINGS_MOUSE LO_SETTINGS_MOUSE +#undef LO_SETTINGS_MOUSE +#define SETTINGS_LOCALE LO_SETTINGS_LOCALE +#undef LO_SETTINGS_LOCALE + using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/aqua/CFStringUtilities.hxx |8 1 file changed, 8 insertions(+) New commits: commit 693f266d810904945950fa72251df9c35bd6d9aa Author: Matúš Kukan Date: Tue Dec 27 13:36:45 2011 +0100 WaE: unused variables diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx index 578782b..6974899 100644 --- a/fpicker/source/aqua/CFStringUtilities.hxx +++ b/fpicker/source/aqua/CFStringUtilities.hxx @@ -71,6 +71,8 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1); #if OSL_DEBUG_LEVEL > 1 CFShow(value1); +#else +(void)value1; #endif } @@ -78,6 +80,8 @@ inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname, con OSL_TRACE(">>> %s::%s%s%s =", classname, methodname, PARAMFILLER, param1); #if OSL_DEBUG_LEVEL > 1 NSLog(value1); +#else +(void)value1; #endif } @@ -145,6 +149,8 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, cons OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER); #if OSL_DEBUG_LEVEL > 1 CFShow(retVal); +#else +(void)retVal; #endif } @@ -152,6 +158,8 @@ inline void DBG_PRINT_EXIT(const char * classname, const char * methodname, cons OSL_TRACE("<<< %s::%s%sreturnValue = ", classname, methodname, PARAMFILLER); #if OSL_DEBUG_LEVEL > 1 NSLog(retVal); +#else +(void)retVal; #endif } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source vcl/source vcl/win
fpicker/source/win32/filepicker/SolarMutex.cxx |1 - fpicker/source/win32/filepicker/asynceventnotifier.cxx |5 ++--- vcl/source/app/settings.cxx|4 ++-- vcl/win/source/app/salinfo.cxx |4 ++-- vcl/win/source/app/salshl.cxx |3 ++- vcl/win/source/window/salobj.cxx |2 -- 6 files changed, 8 insertions(+), 11 deletions(-) New commits: commit b5423ef42e18caac3ceb5d880ba1b6a1737e155c Author: Michael Meeks Date: Tue Oct 25 17:04:48 2011 +0100 WaE: misc. windows related fixes diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx index b11d35a..ba3d0ed 100644 --- a/fpicker/source/win32/filepicker/SolarMutex.cxx +++ b/fpicker/source/win32/filepicker/SolarMutex.cxx @@ -36,7 +36,6 @@ int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId) { int nAcquireCount = 0; -osl::SolarMutex& rSolarMutex = Application::GetSolarMutex(); oslThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier(); if ( nMainThreadId == nThreadId ) diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index fac8480..4cfbe94 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -158,9 +158,8 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) void SAL_CALL CAsyncEventNotifier::shutdown() { -unsigned nThreadId = GetCurrentThreadId(); - -OSL_PRECOND(nThreadId != m_ThreadId, "Method called in wrong thread context!"); +OSL_PRECOND(GetCurrentThreadId() != m_ThreadId, +"Method called in wrong thread context!"); osl::ResettableMutexGuard aGuard(m_Mutex); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0b4f7a9..1795d5a 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -1280,14 +1280,14 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) { case REG_SZ: RegSetValueEx(hkey, "SupportAssistiveTechnology", -NULL, dwType, +0, dwType, bEnable ? (sal_uInt8 *) "true" : (sal_uInt8 *) "false", bEnable ? sizeof("true") : sizeof("false")); break; case REG_DWORD: ((DWORD *) Data)[0] = bEnable ? 1 : 0; RegSetValueEx(hkey, "SupportAssistiveTechnology", -NULL, dwType, Data, sizeof(DWORD)); +0, dwType, Data, sizeof(DWORD)); break; default: // Unsupported registry type diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 03d1810..ae10ae4 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -156,8 +156,8 @@ bool WinSalSystem::initMonitors() // append monitor numbers to name strings boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); -unsigned int nMonitors = m_aMonitors.size(); -for( unsigned int i = 0; i < nMonitors; i++ ) +unsigned int nMonitorCount = m_aMonitors.size(); +for( unsigned int i = 0; i < nMonitorCount; i++ ) { const rtl::OUString& rDev( m_aMonitors[i].m_aName ); if( aDeviceStringCount[ rDev ] > 1 ) diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index caebe9c..ccc6432 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -67,8 +67,9 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) if ( !_CRT_INIT( hInst, nReason, pReserved ) ) #endif return 0; +#else +(void)pReserved; #endif - return 1; } diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index f79ad89..0ee631d 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -116,11 +116,9 @@ sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg ) { // look for the first SalObject in the parent hierarchy HWND hWin = rMsg.hwnd; -HWND hLastOLEWindow = hWin; WinSalObject* pSalObj = NULL; do { -hLastOLEWindow = hWin; hWin = ::GetParent( hWin ); if ( hWin ) { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: fpicker/source
fpicker/source/win32/filepicker/FileOpenDlg.cxx |8 fpicker/source/win32/filepicker/filepickerstate.cxx |2 +- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit d624a657a8f47a4d970e7b1c0d15d9b2b7d1437d Author: Fridrich Å trba Date: Wed Oct 5 14:12:02 2011 +0200 Fix fpicker windows build diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx index cb1c446..8bcbe48 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx @@ -243,7 +243,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() const rtl::OUString SAL_CALL CFileOpenDialog::getFileName() const { -return rtl::OUString(m_fileTitleBuffer); +return rtl::OUString(m_fileTitleBuffer.getStr()); } // @@ -374,7 +374,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const if (nLen > 0) { m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1); -return rtl::OUString(m_helperBuffer); +return rtl::OUString(m_helperBuffer.getStr()); } return rtl::OUString(); } @@ -396,7 +396,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const if (nLen > 0) { m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1); -return rtl::OUString(m_helperBuffer); +return rtl::OUString(m_helperBuffer.getStr()); } return rtl::OUString(); } @@ -418,7 +418,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const if (nLen > 0) { m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1); -return rtl::OUString(m_helperBuffer); +return rtl::OUString(m_helperBuffer.getStr()); } return rtl::OUString(); } diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index aec50c5..eeba2e7 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -213,7 +213,7 @@ OUString MatchFixBrokenPath(const OUString& path) if (path[1] == ':' && path[2] == '.' && path[3] == '\\') { // skip the '.' -return OUString(path, 2) + path.copy(3, path.getLength() - 3); +return OUString(path.getStr(), 2) + path.copy(3, path.getLength() - 3); } return path; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits