Convert FontWorkShapeTypeControl to the generic controller

Change-Id: I7824136aa2780c4062a66f7a5284a342862f319a
pranavk · Jul 16, 2015 · b1d4af6 · b1d4af6
1 parent f18ca15
commit b1d4af6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 49 deletions.
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
@@ -48,17 +48,6 @@ class SfxBindings;
 namespace svx
 {
 
-class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkShapeTypeControl : public SfxToolBoxControl
-{
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
-    virtual ~FontWorkShapeTypeControl();
-
-    virtual void                Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
-    virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
-};
-
 class SAL_WARN_UNUSED FontworkCharacterSpacingDialog : public ModalDialog
 {
     VclPtr<MetricField> m_pMtrScale;

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -411,6 +411,20 @@
           <value>com.sun.star.comp.svx.FontworkCharacterSpacingController</value>
         </prop>
       </node>
+      <node oor:name="FontworkShapeTypeControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FontworkShapeType</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>fontworkshapetype</value>
+        </prop>
+      </node>
       <node oor:name="c3" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:ChartElementSelector</value>

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
@@ -731,7 +731,6 @@
 #include <svx/fntszctl.hxx>
 #include <svx/fontwork.hxx>
 #include <svx/fontworkbar.hxx>
-#include <svx/fontworkgallery.hxx>
 #include <svx/formatpaintbrushctrl.hxx>
 #include <svx/framelinkarray.hxx>
 #include <svx/gallery.hxx>

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
@@ -33,7 +33,6 @@
 #include <avmedia/mediaplayer.hxx>
 #include <avmedia/mediatoolbox.hxx>
 #include <comphelper/types.hxx>
-#include <svx/fontworkgallery.hxx>
 #include <svx/ParaLineSpacingPopup.hxx>
 
 #include <svtools/parhtml.hxx>
@@ -217,7 +216,6 @@ void ScDLL::Init()
 
     // CustomShape extrusion controller
     SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
-    svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod );
 
     // Child Windows
 

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
@@ -648,7 +648,6 @@
 #include <svx/fntszctl.hxx>
 #include <svx/fontwork.hxx>
 #include <svx/fontworkbar.hxx>
-#include <svx/fontworkgallery.hxx>
 #include <svx/formatpaintbrushctrl.hxx>
 #include <svx/gallery.hxx>
 #include <svx/galleryitem.hxx>

diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
@@ -69,7 +69,6 @@
 #include <svx/fntctl.hxx>
 #include <svx/fntszctl.hxx>
 #include <svx/fontwork.hxx>
-#include <svx/fontworkgallery.hxx>
 #include <svx/formatpaintbrushctrl.hxx>
 #include <svx/ParaLineSpacingPopup.hxx>
 #include <svx/grafctrl.hxx>
@@ -250,7 +249,6 @@ void SdDLL::RegisterControllers()
     SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod );
 
     SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
-    svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod );
     svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod);
 
     ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod );

diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -260,36 +260,6 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl)
 
 
 
-SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem );
-FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
-: SfxToolBoxControl( nSlotId, nId, rTbx )
-{
-    rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) );
-    rTbx.Invalidate();
-}
-
-
-
-FontWorkShapeTypeControl::~FontWorkShapeTypeControl()
-{
-}
-
-
-
-VclPtr<SfxPopupWindow> FontWorkShapeTypeControl::CreatePopupWindow()
-{
-    OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" );
-    createAndPositionSubToolBar( aSubTbxResName );
-    return NULL;
-}
-
-
-
-void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/)
-{
-
-}
-
 class FontworkAlignmentWindow : public ToolbarMenu
 {
 public:

diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
@@ -50,7 +50,6 @@
 #include <svx/imapdlg.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/hyperdlg.hxx>
-#include <svx/fontworkgallery.hxx>
 #include <svx/modctrl.hxx>
 #include <com/sun/star/scanner/ScannerManager.hpp>
 #include <com/sun/star/container/XSet.hpp>
@@ -294,7 +293,6 @@ void SwDLL::RegisterControls()
     svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod);
 
     SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
-    svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod );
 
     SfxSaveAsToolBoxControl::RegisterControl(SID_SAVEASDOC, pMod );
     SvxClipBoardControl::RegisterControl(SID_PASTE, pMod );