strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS residcleanup (1.5.92); FILE MERGED

Browse source 
2007/02/18 19:38:29 pl 1.5.92.1: #i74635# get rid of implicit global ResMgr
This commit is contained in:
Rüdiger Timm 2007-04-26 07:15:58 +00:00
parent 00712aa434
commit 3915ddfd16
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
framework/source/classes/fwkresid.cxx
View file

@ -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() )
{
}