diff options
| author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-03-02 13:30:28 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-02 15:40:08 +0200 |
| commit | bcd21acf727da88388c2dcbc795c24525f178dde (patch) | |
| tree | f6c3368210a8163772e44f62a5980ec7a1586fab | |
| parent | 48666b7d6006618d46e2a7686391440830f47ef1 (diff) | |
fdo#46501: Cleanup SimpleResMgr
| -rw-r--r-- | extensions/source/resource/oooresourceloader.cxx | 2 | ||||
| -rw-r--r-- | tools/inc/tools/simplerm.hxx | 13 | ||||
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 7 |
3 files changed, 1 insertions, 21 deletions
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 21b9f5628eaf..a0320daa2487 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -202,7 +202,7 @@ namespace extensions { namespace resource ,m_pResourceManager( NULL ) { ::rtl::OUString sBaseName( _rBaseName ); - m_pResourceManager = new SimpleResMgr( sBaseName, m_aLocale ); + m_pResourceManager = new SimpleResMgr( rtl::OUStringToOString( sBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), m_aLocale ); if ( !m_pResourceManager->IsValid() ) { diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx index 0794ed102519..cee100fe8138 100644 --- a/tools/inc/tools/simplerm.hxx +++ b/tools/inc/tools/simplerm.hxx @@ -61,19 +61,6 @@ public: SimpleResMgr( const sal_Char* pPrefixName, const ::com::sun::star::lang::Locale& _rLocale); - /** creates a new SimpleResManager - @param _rPrefixName - denotes the prefix of the resource file name - @param _inout_Locale - denotes the locale of the resource file to load. If empty, no default handling - (like in the other constructor) will happen, instead an unlocalized version will be - attempted to be loaded. - Upon return, the variable will contain the actual locale of the loaded resource file. - For instance, if "en-US" is requested, but only "en" exists, the latter will be loaded - and returned. Furthermore, if an unlocalized resource file with only the base name exists, - this one will be loaded as final fallback. - */ - SimpleResMgr( const ::rtl::OUString& _rPrefixName, ::com::sun::star::lang::Locale& _inout_Locale ); virtual ~SimpleResMgr(); static SimpleResMgr* Create( const sal_Char* pPrefixName, diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 8af6da3bd16b..8c6358ea6e5c 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1926,13 +1926,6 @@ SimpleResMgr::SimpleResMgr( const sal_Char* pPrefixName, } // ----------------------------------------------------------------------- -SimpleResMgr::SimpleResMgr( const ::rtl::OUString& _rPrefixName, ::com::sun::star::lang::Locale& _inout_Locale ) -{ - osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); - m_pResImpl = ResMgrContainer::get().getResMgr( _rPrefixName, _inout_Locale, true ); -} - -// ----------------------------------------------------------------------- SimpleResMgr::~SimpleResMgr() { delete m_pResImpl; |