diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 16:00:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 16:00:12 +0000 |
| commit | 746715e69d981ba5b14dee42147870dd6e546efd (patch) | |
| tree | 6ca9ee3c6dd4856707b9868ced951b70ab9f3ead /sfx2/source/toolbox/tbxitem.cxx | |
| parent | 4d16f6bf17300f5fb7444738ac01d2704124e210 (diff) | |
INTEGRATION: CWS sfxcleanup (1.57.8); FILE MERGED
2006/05/02 13:34:00 mba 1.57.8.4: RESYNC: (1.57-1.58); FILE MERGED
2006/03/29 18:50:30 mba 1.57.8.3: #132394#: remove superfluous code
2006/03/04 13:02:59 mba 1.57.8.2: #132394#: remove superfluous code
2006/02/26 17:10:00 mba 1.57.8.1: #132394#: remove superfluous code
Diffstat (limited to 'sfx2/source/toolbox/tbxitem.cxx')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 061f9b098e15..b576bdfd7214 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tbxitem.cxx,v $ * - * $Revision: 1.58 $ + * $Revision: 1.59 $ * - * last change: $Author: obo $ $Date: 2006-03-24 13:46:08 $ + * last change: $Author: rt $ $Date: 2006-05-02 17:00:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,10 +164,8 @@ #include "macrconf.hxx" #include "genlink.hxx" #include "sfxresid.hxx" -#include "toolbox.hrc" #include "sfx.hrc" #include "module.hxx" -#include "appdata.hxx" #include "docfile.hxx" #include "docfac.hxx" #include "referers.hxx" @@ -260,7 +258,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X if ( pModule ) pSlotPool = pModule->GetSlotPool(); else - pSlotPool = &(SFX_APP()->GetSlotPool( NULL )); + pSlotPool = &(SfxSlotPool::GetSlotPool( NULL )); const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path ); if ( pSlot ) @@ -326,8 +324,6 @@ SfxToolBoxControl::SfxToolBoxControl( pImpl->nSlotId = nSlotID; pImpl->mpFloatingWindow = 0; pImpl->mpPopupWindow = 0; - - //DBG( CheckConfigure_Impl(SFX_SLOT_TOOLBOXCONFIG) ); } //-------------------------------------------------------------------- @@ -394,6 +390,10 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime } //-------------------------------------------------------------------- +void SfxToolBoxControl::RegisterToolBoxControl( SfxModule* pMod, SfxTbxCtrlFactory* pFact) +{ + SFX_APP()->RegisterToolBoxControl_Impl( pMod, pFact ); +} SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule* pMod ) { @@ -406,7 +406,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( USHORT nSlotId, USHORT nTbx if ( pMod ) pSlotPool = pMod->GetSlotPool(); else - pSlotPool = &pApp->GetSlotPool(); + pSlotPool = &SfxSlotPool::GetSlotPool(); TypeId aSlotType = pSlotPool->GetSlotType( nSlotId ); if ( aSlotType ) { @@ -609,7 +609,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } USHORT nSlotId = 0; - SfxSlotPool& rPool = SFX_APP()->GetSlotPool( pViewFrame ); + SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame ); const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path ); if ( pSlot ) nSlotId = pSlot->GetSlotId(); @@ -1165,7 +1165,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } USHORT nSlotId = 0; - SfxSlotPool& rPool = SFX_APP()->GetSlotPool( pViewFrame ); + SfxSlotPool& rPool = SfxSlotPool::GetSlotPool( pViewFrame ); const SfxSlot* pSlot = rPool.GetUnoSlot( rEvent.FeatureURL.Path ); if ( pSlot ) nSlotId = pSlot->GetSlotId(); |