diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-06 22:38:11 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-02-07 00:31:29 +0900 |
| commit | 254f372b01953ec5abda9c58b7e35a2ec4b1943d (patch) | |
| tree | ac557e51058edc713e89a0627ac78f3f71d2ec16 | |
| parent | baf5ffc7c0c8ed7b1bd8f001a91e53eace9e0334 (diff) | |
Use defined utility BASIC_DLL()/BASIC_MOD()
| -rw-r--r-- | basctl/source/basicide/iderdll.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/basrdll.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 10c4c8353c82..c8da69e0b799 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -125,7 +125,7 @@ namespace BasicIDEGlobals } IDEResId::IDEResId( sal_uInt16 nId ): - ResId( nId, *(*(BasicIDEModule**)GetAppData(SHL_IDE))->GetResMgr() ) + ResId( nId, *(BASIC_MOD())->GetResMgr() ) { } diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index e55910b37b25..e792c03f750d 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -38,13 +38,13 @@ #include <sb.hrc> BasResId::BasResId( sal_uInt32 nId ) : - ResId( nId, *((*(BasicDLL**)GetAppData(SHL_BASIC))->GetBasResMgr()) ) + ResId( nId, *(BASIC_DLL()->GetBasResMgr()) ) { } BasicDLL::BasicDLL() { - *(BasicDLL**)GetAppData(SHL_BASIC) = this; + BASIC_DLL() = this; ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); pBasResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(sb), aLocale ); bDebugMode = sal_False; @@ -58,7 +58,7 @@ BasicDLL::~BasicDLL() void BasicDLL::EnableBreak( sal_Bool bEnable ) { - BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC); + BasicDLL* pThis = BASIC_DLL(); DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" ); if ( pThis ) pThis->bBreakEnabled = bEnable; @@ -66,7 +66,7 @@ void BasicDLL::EnableBreak( sal_Bool bEnable ) void BasicDLL::SetDebugMode( sal_Bool bDebugMode ) { - BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC); + BasicDLL* pThis = BASIC_DLL(); DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" ); if ( pThis ) pThis->bDebugMode = bDebugMode; @@ -79,7 +79,7 @@ void BasicDLL::BasicBreak() // but the Basic doesn't stop early enough, the box might appear more often... static sal_Bool bJustStopping = sal_False; - BasicDLL* pThis = *(BasicDLL**)GetAppData(SHL_BASIC); + BasicDLL* pThis = BASIC_DLL(); DBG_ASSERT( pThis, "BasicDLL::EnableBreak: Noch keine Instanz!" ); if ( pThis ) { |