Sidebar Text panel cleanup

Change-Id: I6cbf5a9e5ad9d61df2abbcc835ba60d45768deeb
Reviewed-on: https://gerrit.libreoffice.org/7687Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svx/source/sidebar/text/SvxSBFontNameBox.hxx

@@ -22,11 +22,6 @@
 #include <svtools/ctrlbox.hxx>
 #include <svtools/ctrltool.hxx>
 
-namespace svx
-{
-    class ToolboxButtonColorUpdater;
-}
-
 namespace svx { namespace sidebar {
 
 class SvxSBFontNameBox : public FontNameBox//, public SfxListener

svx/source/sidebar/text/TextPropertyPanel.hrc

@@ -67,10 +67,6 @@
 
 #define STR_WITHOUT             50
 
-//popup window font color
-#define VS_FONT_COLOR           1
-#define STR_AUTOMATICE          2
-
 //POPUP WINDOW OF SPACING
 #define VS_SPACING                  1
 

svx/source/sidebar/text/TextPropertyPanel.hxx

@@ -25,8 +25,6 @@
 #include <sfx2/sidebar/EnumContext.hxx>
 
 #include <svtools/ctrlbox.hxx>
-#include <svx/tbxcolorupdate.hxx>
-#include <editeng/svxenum.hxx>
 #include <editeng/fhgtitem.hxx>
 
 #include <com/sun/star/ui/XSidebar.hpp>
@@ -35,7 +33,6 @@
 #include <boost/scoped_ptr.hpp>
 #include "TextCharacterSpacingPopup.hxx"
 #include "TextUnderlinePopup.hxx"
-#include <svx/sidebar/ColorPopup.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
 #include <vcl/vclenum.hxx>
 
@@ -69,7 +66,6 @@ public:
     void EndUnderlinePopupMode (void);
     void SetUnderline(FontUnderline eUnderline);
     Color& GetUnderlineColor();
-    void SetDefaultUnderline(FontUnderline eUnderline);
 
 
     virtual void HandleContextChange (
@@ -95,36 +91,16 @@ private:
     //control items
     ::sfx2::sidebar::ControllerItem maFontNameControl;
     ::sfx2::sidebar::ControllerItem maFontSizeControl;
-    ::sfx2::sidebar::ControllerItem maWeightControl;
-    ::sfx2::sidebar::ControllerItem maItalicControl;
     ::sfx2::sidebar::ControllerItem maUnderlineControl;
-    ::sfx2::sidebar::ControllerItem maStrikeControl;
-    ::sfx2::sidebar::ControllerItem maShadowControl;
-    ::sfx2::sidebar::ControllerItem maScriptControlSw;
-    ::sfx2::sidebar::ControllerItem maSuperScriptControl;
-    ::sfx2::sidebar::ControllerItem maSubScriptControl;
     ::sfx2::sidebar::ControllerItem maSpacingControl;
-    ::sfx2::sidebar::ControllerItem maSDFontGrow;
-    ::sfx2::sidebar::ControllerItem maSDFontShrink;
 
-    FontWeight                  meWeight;
-    FontItalic                  meItalic;
     FontUnderline               meUnderline;
     Color                       meUnderlineColor;
-    bool                        mbShadow;
-    FontStrikeout               meStrike;
-    bool mbWeightAvailable;
-    bool mbPostureAvailable;
-    SvxEscapement               meEscape;  //for sw
-    bool                        mbSuper;
-    bool                        mbSub;
     bool                        mbKernAvailable;
     bool                        mbKernLBAvailable;
     long                        mlKerning;
     SvxFontHeightItem*          mpHeightItem;
 
-    const FontList* mpFontList;
-    bool mbMustDelete;
     bool mbFocusOnFontSizeCtrl;
     TextCharacterSpacingPopup maCharSpacePopup;
     TextUnderlinePopup maUnderlinePopup;
@@ -148,8 +124,6 @@ private:
     void Initialize (void);
     void SetupToolboxItems (void);
     void InitToolBoxFont();
-    void InitToolBoxIncDec();
-    void InitToolBoxScript();
     void InitToolBoxSpacing();
 
     DECL_LINK(FontSelHdl, FontNameBox *);
@@ -157,19 +131,8 @@ private:
     DECL_LINK(FontSizeSelHdl, FontSizeBox *);
     DECL_LINK(FontSizeLoseFocus, FontSizeBox *);
     DECL_LINK(ToolboxFontSelectHandler, ToolBox *);
-    DECL_LINK(ToolboxIncDecSelectHdl, ToolBox *);
-    DECL_LINK(ToolBoxScriptSelectHdl, ToolBox *);
 
-    void UpdateItem (const sal_uInt16 nSlotId);
-
-    /** Depending on the given context make one of the toolboxes
-        mpToolBoxFontColor and mpToolBoxFontColorSW visible.  Both
-        occupy the same space.
-    */
-    void UpdateFontColorToolbox (
-        const ::sfx2::sidebar::EnumContext aContext);
-
-    bool isWriter();
+    void UpdateFontColorToolbox (bool bWriterText);
 };
 
 } } // end of namespace ::svx::sidebar

svx/source/sidebar/text/TextPropertyPanel.src

@@ -180,28 +180,6 @@ Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE
 };
 
 
-Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
-{
-    OutputSize = TRUE;
-    DialogControl = TRUE;
-    Border = FALSE;
-    Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT  );
-
-    Control VS_FONT_COLOR
-    {
-        HelpID = HID_PPROPERTYPANEL_TEXT_COLOR_VS;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
-        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
-        TabStop = TRUE ;
-        Text = "Color Picker";
-    };
-    String STR_AUTOMATICE
-    {
-        Text [ en-US ] = "Automatic";
-    };
-};
-
 Control RID_POPUPPANEL_TEXTPAGE_SPACING
 {
     OutputSize = TRUE;

svx/source/sidebar/text/TextUnderlineControl.cxx

@@ -21,7 +21,6 @@
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <unotools/viewoptions.hxx>
-#include <editeng/kernitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/Theme.hxx>

svx/source/sidebar/text/TextUnderlinePopup.cxx

@@ -27,7 +27,7 @@ TextUnderlinePopup::TextUnderlinePopup (
     : Popup(
         pParent,
         rControlCreator,
-        OUString( "Character Spacing"))
+        OUString( "Underline"))
 {
 }