diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 07:15:58 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 07:15:58 +0000 |
| commit | 3915ddfd16da4586142a3f078de754568c281f42 (patch) | |
| tree | af60b28863b4131d71b5cd209cb5395d9b3ffb31 | |
| parent | 00712aa434eadaf46fb2fefec1288ee92b8489b8 (diff) | |
INTEGRATION: CWS residcleanup (1.5.92); FILE MERGED
2007/02/18 19:38:29 pl 1.5.92.1: #i74635# get rid of implicit global ResMgr
| -rw-r--r-- | framework/source/classes/fwkresid.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/framework/source/classes/fwkresid.cxx b/framework/source/classes/fwkresid.cxx index 6cd5b5d8a532..cc9da0344612 100644 --- a/framework/source/classes/fwkresid.cxx +++ b/framework/source/classes/fwkresid.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fwkresid.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 13:47:03 $ + * last change: $Author: rt $ $Date: 2007-04-26 08:15:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,7 @@ #include <vcl/svapp.hxx> #endif -#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8) +#include <rtl/strbuf.hxx> namespace framework { @@ -59,13 +59,14 @@ ResMgr* FwkResId::GetResManager() { static ResMgr* pResMgr = NULL; - String aMgrName = String::CreateFromAscii( "fwe" ); - aMgrName += String::CreateFromInt32(SUPD); // current version number - if ( !pResMgr ) { + rtl::OStringBuffer aBuf( 32 ); + aBuf.append( "fwe" ); + aBuf.append( sal_Int32( SUPD ) ); // current version number + vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - pResMgr = ResMgr::CreateResMgr( U2S( aMgrName )); + pResMgr = ResMgr::CreateResMgr( aBuf.getStr() ); } return pResMgr; @@ -74,7 +75,7 @@ ResMgr* FwkResId::GetResManager() // ----------------------------------------------------------------------- FwkResId::FwkResId( USHORT nId ) : - ResId( nId, FwkResId::GetResManager() ) + ResId( nId, *FwkResId::GetResManager() ) { } |