diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 12:58:02 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 12:58:02 +0000 |
| commit | 2a7179c38047e872e6a82c9f5aff8d870908c030 (patch) | |
| tree | 429116ee72c479c9861c0884f739da0264126d7a | |
| parent | 23882fb6d30f52389d8563e5faea5b760b0f5ebd (diff) | |
INTEGRATION: CWS vcl79 (1.10.14); FILE MERGED
2007/06/19 07:57:02 pl 1.10.14.1: #i77748# do not lock the solarmutex during message dispatch, this can deadlock the process
| -rw-r--r-- | fpicker/source/win32/misc/resourceprovider.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 04ca6e31cc7a..cf1635d0f724 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -4,9 +4,9 @@ * * $RCSfile: resourceprovider.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:26:48 $ + * last change: $Author: rt $ $Date: 2007-07-03 13:58:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,8 +60,8 @@ #include <vcl/svapp.hxx> #endif -#ifndef _TOOLS_RESMGR_HXX -#include <tools/resmgr.hxx> +#ifndef _TOOLS_SIMPLERESMGR_HXX +#include <tools/simplerm.hxx> #endif #ifndef _COM_SUN_STAR_UI_DIALOGS_COMMONFILEPICKERELEMENTIDS_HPP_ @@ -153,7 +153,10 @@ public: CResourceProvider_Impl( ) { - m_ResMgr = CREATEVERSIONRESMGR( RES_NAME ); + const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + + com::sun::star::lang::Locale aLoc( Application::GetSettings().GetUILocale() ); + m_ResMgr = new SimpleResMgr( CREATEVERSIONRESMGR_NAME( RES_NAME ), aLoc ); } //------------------------------------- @@ -171,11 +174,8 @@ public: OUString getResString( sal_Int16 aId ) { - String aResString; OUString aResOUString; - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - try { OSL_ASSERT( m_ResMgr ); @@ -184,10 +184,7 @@ public: sal_Int16 aResId = CtrlIdToResId( aId ); if ( aResId > -1 ) - { - aResString = String( ResId( aResId, *m_ResMgr ) ); - aResOUString = OUString( aResString ); - } + aResOUString = m_ResMgr->ReadString( aResId ); } catch(...) { @@ -197,7 +194,7 @@ public: } public: - ResMgr* m_ResMgr; + SimpleResMgr* m_ResMgr; }; //------------------------------------------------------------ |