From dcd8e4664d9a284c24ceb0360cab0606b22cf86d Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Fri, 7 Jan 2011 17:14:47 +0100 Subject: removetooltypes: #i112600# remove tooltypes --- sfx2/source/appl/module.cxx | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'sfx2/source/appl/module.cxx') diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index ba91d9c1117b..90b93cc3748e 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -73,7 +73,7 @@ public: SfxModule_Impl(); ~SfxModule_Impl(); - ImageList* GetImageList( ResMgr*, BOOL, BOOL bHiContrast = FALSE ); + ImageList* GetImageList( ResMgr*, sal_Bool, sal_Bool bHiContrast = sal_False ); }; SfxModule_Impl::SfxModule_Impl() @@ -94,7 +94,7 @@ SfxModule_Impl::~SfxModule_Impl() delete pImgListHiBig; } -ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, BOOL bBig, BOOL bHiContrast ) +ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, sal_Bool bBig, sal_Bool bHiContrast ) { ImageList*& rpList = bBig ? ( bHiContrast ? pImgListHiBig: pImgListBig ) : ( bHiContrast ? pImgListHiSmall : pImgListSmall ); @@ -131,7 +131,7 @@ ResMgr* SfxModule::GetResMgr() //==================================================================== /* -SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP, +SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP, SfxObjectFactory* pFactoryP ) : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L) { @@ -140,7 +140,7 @@ SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP, pFactoryP->SetModule_Impl( this ); } */ -SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP, +SfxModule::SfxModule( ResMgr* pMgrP, sal_Bool bDummyP, SfxObjectFactory* pFactoryP, ... ) : pResMgr( pMgrP ), bDummy( bDummyP ), pImpl(0L) { @@ -187,7 +187,7 @@ SfxModule::~SfxModule() { // Das Modul wird noch vor dem DeInitialize zerst"ort, also auis dem Array entfernen SfxModuleArr_Impl& rArr = GetModules_Impl(); - for( USHORT nPos = rArr.Count(); nPos--; ) + for( sal_uInt16 nPos = rArr.Count(); nPos--; ) { if( rArr[ nPos ] == this ) { @@ -220,7 +220,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) pImpl->pFactArr = new SfxChildWinFactArr_Impl; //#ifdef DBG_UTIL - for (USHORT nFactory=0; nFactorypFactArr->Count(); ++nFactory) + for (sal_uInt16 nFactory=0; nFactorypFactArr->Count(); ++nFactory) { if (pFact->nId == (*pImpl->pFactArr)[nFactory]->nId) { @@ -237,13 +237,13 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) //------------------------------------------------------------------------- -void SfxModule::RegisterChildWindowContext( USHORT nId, +void SfxModule::RegisterChildWindowContext( sal_uInt16 nId, SfxChildWinContextFactory *pFact) { DBG_ASSERT( pImpl, "Kein echtes Modul!" ); - USHORT nCount = pImpl->pFactArr->Count(); - for (USHORT nFactory=0; nFactorypFactArr->Count(); + for (sal_uInt16 nFactory=0; nFactorypFactArr)[nFactory]; if ( nId == pF->nId ) @@ -266,7 +266,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) pImpl->pTbxCtrlFac = new SfxTbxCtrlFactArr_Impl; #ifdef DBG_UTIL - for ( USHORT n=0; npTbxCtrlFac->Count(); n++ ) + for ( sal_uInt16 n=0; npTbxCtrlFac->Count(); n++ ) { SfxTbxCtrlFactory *pF = (*pImpl->pTbxCtrlFac)[n]; if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && @@ -288,7 +288,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact ) pImpl->pStbCtrlFac = new SfxStbCtrlFactArr_Impl; #ifdef DBG_UTIL - for ( USHORT n=0; npStbCtrlFac->Count(); n++ ) + for ( sal_uInt16 n=0; npStbCtrlFac->Count(); n++ ) { SfxStbCtrlFactory *pF = (*pImpl->pStbCtrlFac)[n]; if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && @@ -310,7 +310,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact ) pImpl->pMenuCtrlFac = new SfxMenuCtrlFactArr_Impl; #ifdef DBG_UTIL - for ( USHORT n=0; npMenuCtrlFac->Count(); n++ ) + for ( sal_uInt16 n=0; npMenuCtrlFac->Count(); n++ ) { SfxMenuCtrlFactory *pF = (*pImpl->pMenuCtrlFac)[n]; if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && @@ -352,17 +352,17 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const return pImpl->pFactArr; } -ImageList* SfxModule::GetImageList_Impl( BOOL bBig ) +ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig ) { - return pImpl->GetImageList( pResMgr, bBig, FALSE ); + return pImpl->GetImageList( pResMgr, bBig, sal_False ); } -ImageList* SfxModule::GetImageList_Impl( BOOL bBig, BOOL bHiContrast ) +ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig, sal_Bool bHiContrast ) { return pImpl->GetImageList( pResMgr, bBig, bHiContrast ); } -SfxTabPage* SfxModule::CreateTabPage( USHORT, Window*, const SfxItemSet& ) +SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& ) { return NULL; } @@ -379,7 +379,7 @@ void SfxModule::DestroyModules_Impl() if ( pModules ) { SfxModuleArr_Impl& rModules = *pModules; - for( USHORT nPos = rModules.Count(); nPos--; ) + for( sal_uInt16 nPos = rModules.Count(); nPos--; ) { SfxModule* pMod = rModules.GetObject(nPos); delete pMod; @@ -387,22 +387,22 @@ void SfxModule::DestroyModules_Impl() } } -void SfxModule::Invalidate( USHORT nId ) +void SfxModule::Invalidate( sal_uInt16 nId ) { for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) ) if ( pFrame->GetObjectShell()->GetModule() == this ) Invalidate_Impl( pFrame->GetBindings(), nId ); } -BOOL SfxModule::IsActive() const +sal_Bool SfxModule::IsActive() const { SfxViewFrame* pFrame = SfxViewFrame::Current(); if ( pFrame && pFrame->GetObjectShell()->GetFactory().GetModule() == this ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } -bool SfxModule::IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const +bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const { if ( i_nId != SID_TASKPANE ) // by default, assume it is -- cgit