basctl/source/basicide/iderdll.cxx | 5 +---- basic/source/runtime/basrdll.cxx | 10 +++++----- basic/source/runtime/step0.cxx | 6 ------ sc/inc/scdll.hxx | 2 -- 4 files changed, 6 insertions(+), 17 deletions(-)
New commits: commit 905d1a4ebe2fd69b0935b630c79b4202bf56be08 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Mon Feb 6 23:38:38 2012 +0900 Removed duplicate macro diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 43a9c9f..e446ea6 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -66,8 +66,6 @@ public: SfxFilterFlags nMust, SfxFilterFlags nDont ); }; -#define SC_DLL() ( *(ScModule**) GetAppData(SHL_CALC) ) - #endif commit 254f372b01953ec5abda9c58b7e35a2ec4b1943d Author: Takeshi Abe <t...@fixedpoint.jp> Date: Mon Feb 6 22:38:11 2012 +0900 Use defined utility BASIC_DLL()/BASIC_MOD() diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 10c4c83..c8da69e 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 e55910b..e792c03 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 ) { commit baf5ffc7c0c8ed7b1bd8f001a91e53eace9e0334 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Mon Feb 6 22:28:42 2012 +0900 Removed dead code diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 1cf25c4..10c4c83 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -132,9 +132,6 @@ IDEResId::IDEResId( sal_uInt16 nId ): BasicIDEDLL::~BasicIDEDLL() { delete m_pExtraData; -#if 0 - *(BasicIDEDLL**)GetAppData(SHL_IDE) = NULL; -#endif } BasicIDEDLL::BasicIDEDLL() commit 64c498ff1719e5c236e803b69af8ae68bdba459a Author: Takeshi Abe <t...@fixedpoint.jp> Date: Mon Feb 6 22:08:24 2012 +0900 Removed unused variables diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index b5591fd..69c748b 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -1154,13 +1154,7 @@ void SbiRuntime::StepINPUT() else if( err ) { if( pRestart && !pIosys->GetChannel() ) - { - BasResId aId( IDS_SBERR_START + 4 ); - String aMsg( aId ); - - pCode = pRestart; - } else Error( err ); } _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits