diff options
| -rw-r--r-- | include/avmedia/mediatoolbox.hxx | 4 | ||||
| -rw-r--r-- | include/svx/grafctrl.hxx | 17 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 | ||||
| -rw-r--r-- | sc/source/ui/app/scdll.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 1 | ||||
| -rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 26 | ||||
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 1 |
8 files changed, 15 insertions, 51 deletions
diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index fb61d33b865f..e0ccd86ca058 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -27,10 +27,6 @@ namespace avmedia { - -// - SvxGrafFilterToolBoxControl - - - class MediaItem; class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index c91ff3a0de65..1adcc39c2f2e 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -40,23 +40,6 @@ public: }; -// - SvxGrafFilterToolBoxControl - - - -class SVX_DLLPUBLIC SvxGrafFilterToolBoxControl : public SfxToolBoxControl -{ -public: - - SFX_DECL_TOOLBOX_CONTROL(); - - SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxGrafFilterToolBoxControl(); - - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE; -}; - - // - SvxGrafToolBoxControl - diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 8d96dc6f597e..20fc41ea6c92 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -176,6 +176,20 @@ </node> </node> <node oor:name="ToolBar"> + <node oor:name="GraphicFilterControl" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:GraphicFilterToolbox</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.SubToolBarController</value> + </prop> + <prop oor:name="Value"> + <value>graffilterbar</value> + </prop> + </node> <node oor:name="OptimizeTableControl" oor:op="replace"> <prop oor:name="Command"> <value>.uno:OptimizeTable</value> diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 6095a1b3310b..be95d7d85b7f 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -185,7 +185,6 @@ void ScDLL::Init() SvxGrafContrastToolBoxControl ::RegisterControl(SID_ATTR_GRAF_CONTRAST, pMod); SvxGrafGammaToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GAMMA, pMod); SvxGrafTransparenceToolBoxControl::RegisterControl(SID_ATTR_GRAF_TRANSPARENCE, pMod); - SvxGrafFilterToolBoxControl ::RegisterControl(SID_GRFFILTER, pMod); SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod); SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod); diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 928db7b0d7f9..70c91780a6d4 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -208,7 +208,6 @@ void SdDLL::RegisterControllers() SvxColorToolBoxControl::RegisterControl( SID_ATTR_CHAR_COLOR, pMod ); SvxColorToolBoxControl::RegisterControl( SID_ATTR_CHAR_BACK_COLOR, pMod ); - SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod ); SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod ); SvxGrafRedToolBoxControl::RegisterControl( SID_ATTR_GRAF_RED, pMod ); SvxGrafGreenToolBoxControl::RegisterControl( SID_ATTR_GRAF_GREEN, pMod ); diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 51072b6cb437..fe52a8c12291 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5561,7 +5561,7 @@ SfxVoidItem GraphicFilterSolarize SID_GRFFILTER_SOLARIZE ] -TbxImageItem GraphicFilterToolbox SID_GRFFILTER +SfxVoidItem GraphicFilterToolbox SID_GRFFILTER [ /* flags: */ diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 1b6a4f2563a1..6f434e6834ce 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -423,32 +423,6 @@ void ImplGrafModeControl::Update( const SfxPoolItem* pItem ) SetNoSelection(); } -SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem ); - -SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : - SfxToolBoxControl( nSlotId, nId, rTbx ) -{ - rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) ); - rTbx.Invalidate(); -} - -SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl() -{ -} - -void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) -{ - GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) ); -} - -VclPtr<SfxPopupWindow> SvxGrafFilterToolBoxControl::CreatePopupWindow() -{ - OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" ); - createAndPositionSubToolBar( aSubTbxResName ); - - return NULL; -} - SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) : SfxToolBoxControl( nSlotId, nId, rTbx ) { diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 2136bf7f3ae6..779732b959fe 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -367,7 +367,6 @@ void SwDLL::RegisterControls() SvxGrafGammaToolBoxControl::RegisterControl( SID_ATTR_GRAF_GAMMA, pMod ); SvxGrafTransparenceToolBoxControl::RegisterControl( SID_ATTR_GRAF_TRANSPARENCE, pMod ); SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod ); - SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod ); SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_LEFT_TO_RIGHT, pMod); SvxVertTextTbxCtrl::RegisterControl(SID_TEXTDIRECTION_TOP_TO_BOTTOM, pMod); SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod); |