diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:19:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:19:06 +0000 |
| commit | 3777227ad9ef094a5d22f26d06ff569fcc13eee2 (patch) | |
| tree | 6fa5ab948d7da973e492d76147acff65048ea17c /sfx2 | |
| parent | 1a485433df8c37a642defa97d3a583cd098e592a (diff) | |
INTEGRATION: CWS fwkbugfix04 (1.42.6); FILE MERGED
2005/01/06 17:44:15 mba 1.42.6.2: RESYNC: (1.42-1.43); FILE MERGED
2004/12/06 18:03:38 mba 1.42.6.1: #i38334#: get rid of all code based on SfxConfigManager
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 985d317d45c9..0ec91c9911e8 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tbxitem.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: hr $ $Date: 2004-12-13 12:54:17 $ + * last change: $Author: kz $ $Date: 2005-01-18 16:19:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,7 +176,6 @@ #include "tbxctrl.hxx" #include "mnumgr.hxx" -#include "stbmgr.hxx" #include "dispatch.hxx" #include "fltfnc.hxx" #include "msg.hxx" @@ -199,12 +198,12 @@ #include "app.hxx" #include "unoctitm.hxx" #include "helpid.hrc" -#include "imagemgr.hxx" #include "workwin.hxx" #include "imgmgr.hxx" #include "virtmenu.hxx" #include "viewfrm.hxx" #include "module.hxx" +#include "imagemgr.hxx" //using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; @@ -221,8 +220,8 @@ using namespace ::drafts::com::sun::star::ui; SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, TRUE); SFX_IMPL_TOOLBOX_CONTROL(SfxAppToolBoxControl_Impl, SfxStringItem); -SFX_IMPL_TOOLBOX_CONTROL(SfxReloadToolBoxControl_Impl, SfxBoolItem); -SFX_IMPL_TOOLBOX_CONTROL(SfxAddonsToolBoxControl_Impl, SfxVoidItem); +//SFX_IMPL_TOOLBOX_CONTROL(SfxReloadToolBoxControl_Impl, SfxBoolItem); +//SFX_IMPL_TOOLBOX_CONTROL(SfxAddonsToolBoxControl_Impl, SfxVoidItem); svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ) { @@ -1892,7 +1891,7 @@ void SfxAppToolBoxControl_Impl::Click( ) } //-------------------------------------------------------------------- - +/* SfxAddonsToolBoxControl_Impl::SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ) : SfxToolBoxControl( nSlotId, nId, rBox ) , bBigImages( FALSE ) @@ -2041,4 +2040,4 @@ void SfxReloadToolBoxControl_Impl::Select( USHORT nModifier ) if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, aArgs ); } -} +}*/ |