diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 07:33:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-26 07:33:27 +0000 |
| commit | e20bab658ed1adaf0636e34df60eb9920494ee51 (patch) | |
| tree | d55141bf3e3b8ae85ba8c536cbd36d83af3d033a /basic/source/runtime/basrdll.cxx | |
| parent | bf74849defca3850d804f22f5a2f568b77d1af18 (diff) | |
INTEGRATION: CWS residcleanup (1.5.62); FILE MERGED
2007/03/12 12:22:30 pl 1.5.62.3: #i75311# separate stt and sb resources
2007/02/20 11:08:05 pl 1.5.62.2: #i74635# all basic resources from stt resource file henceforth
2007/02/18 21:06:57 pl 1.5.62.1: #i74635# get rid of implicit global ResMgr
Diffstat (limited to 'basic/source/runtime/basrdll.cxx')
| -rw-r--r-- | basic/source/runtime/basrdll.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 1ccda04a61f9..aec34600489d 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -4,9 +4,9 @@ * * $RCSfile: basrdll.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:04:08 $ + * last change: $Author: rt $ $Date: 2007-04-26 08:33:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,8 +57,13 @@ #include <basrid.hxx> #include <sb.hrc> -BasicResId::BasicResId( USHORT nId ): - ResId( nId, (*(BasicDLL**)GetAppData(SHL_BASIC))->GetResMgr() ) +SttResId::SttResId( sal_uInt32 nId ) : + ResId( nId, *((*(BasicDLL**)GetAppData(SHL_BASIC))->GetSttResMgr()) ) +{ +} + +BasResId::BasResId( sal_uInt32 nId ) : + ResId( nId, *((*(BasicDLL**)GetAppData(SHL_BASIC))->GetBasResMgr()) ) { } @@ -66,14 +71,16 @@ BasicDLL::BasicDLL() { *(BasicDLL**)GetAppData(SHL_BASIC) = this; ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); - pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(ofa), aLocale ); + pSttResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(stt), aLocale ); + pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale ); bDebugMode = FALSE; bBreakEnabled = TRUE; } BasicDLL::~BasicDLL() { - delete pResMgr; + delete pSttResMgr; + delete pBasResMgr; } void BasicDLL::EnableBreak( BOOL bEnable ) @@ -107,7 +114,7 @@ void BasicDLL::BasicBreak() { bJustStopping = TRUE; StarBASIC::Stop(); - String aMessageStr( BasicResId( IDS_SBERR_TERMINATED ) ); + String aMessageStr( BasResId( IDS_SBERR_TERMINATED ) ); InfoBox( 0, aMessageStr ).Execute(); bJustStopping = FALSE; } |