Convert filters button to the generic controller

Change-Id: I6d3c76c0aafe0ad77b597a2cb8331e6f8219e2d2

include/avmedia/mediatoolbox.hxx

@@ -27,10 +27,6 @@
 namespace avmedia
 {
 
-
-// - SvxGrafFilterToolBoxControl -
-
-
 class MediaItem;
 
 class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl

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 -
 
 

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>

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);

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 );

svx/sdi/svx.sdi

@@ -5561,7 +5561,7 @@ SfxVoidItem GraphicFilterSolarize SID_GRFFILTER_SOLARIZE
 ]
 
 
-TbxImageItem GraphicFilterToolbox SID_GRFFILTER
+SfxVoidItem GraphicFilterToolbox SID_GRFFILTER
 
 [
     /* flags: */

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 )
 {

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);