sidebar: more cleanup of text panel

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

8 files changed, 0 insertions, 93 deletions

diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index a672e9a1ac8e..ce1941c25dcc 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -22,7 +22,6 @@
 #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>
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index cb5bfae6b24d..67b89ee69f73 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -21,8 +21,6 @@
 #include "svx/sidebar/PopupControl.hxx"
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
 #include <sfx2/bindings.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svtools/ctrltool.hxx>
 #include "TextPropertyPanel.hxx"
 #include <vcl/fixed.hxx>
 
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index c1a61f8ec16f..6c7e7431a463 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -20,8 +20,6 @@
 #include "TextPropertyPanel.hxx"
 #include "SvxSBFontNameBox.hxx"
 
-#include "svx/dialmgr.hxx"
-
 #include <editeng/flstitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/kernitem.hxx>
@@ -30,12 +28,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/ControllerFactory.hxx>
-#include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
-#include "sfx2/imagemgr.hxx"
 #include <svtools/ctrltool.hxx>
 #include <svtools/unitconv.hxx>
 
@@ -51,8 +44,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Theme;
-using ::sfx2::sidebar::ControlFactory;
 
 const char UNO_BACKCOLOR[] = ".uno:BackColor";
 const char UNO_COLOR[] = ".uno:Color";
@@ -62,8 +53,6 @@ const char UNO_UNDERLINE[] = ".uno:Underline";
 
 namespace svx { namespace sidebar {
 
-#undef HAS_IA2
-
 PopupControl* TextPropertyPanel::CreateCharacterSpacingControl (PopupContainer* pParent)
 {
     return new TextCharacterSpacingControl(pParent, *this, mpBindings);
@@ -127,7 +116,6 @@ TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<cs
     get(mpFontSizeBox, "fontsize");
     get(mpToolBoxFont, "fonteffects");
     get(mpToolBoxIncDec, "fontadjust");
-    get(mpToolBoxScript, "position");
     get(mpToolBoxSpacing, "spacingbar");
     get(mpToolBoxFontColor, "colorbar");
 
@@ -254,18 +242,6 @@ void TextPropertyPanel::Initialize (void)
     InitToolBoxFont();
     InitToolBoxSpacing();
 
-#ifdef HAS_IA2
-    mpFontNameBox->SetAccRelationLabeledBy(mpFontNameBox);
-    mpFontNameBox->SetMpSubEditAccLableBy(mpFontNameBox);
-    mpFontSizeBox->SetAccRelationLabeledBy(mpFontSizeBox);
-    mpFontSizeBox->SetMpSubEditAccLableBy(mpFontSizeBox);
-    mpToolBoxFont->SetAccRelationLabeledBy(mpToolBoxFont);
-    mpToolBoxIncDec->SetAccRelationLabeledBy(mpToolBoxIncDec);
-    mpToolBoxFontColor->SetAccRelationLabeledBy(mpToolBoxFontColor);
-    mpToolBoxScript->SetAccRelationLabeledBy(mpToolBoxScript);
-    mpToolBoxSpacing->SetAccRelationLabeledBy(mpToolBoxSpacing);
-#endif
-
     //init state
     mpHeightItem = NULL;
     meUnderline = UNDERLINE_NONE;
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hrc b/svx/source/sidebar/text/TextPropertyPanel.hrc
index 89fb8d572555..5685efa55e41 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -25,12 +25,9 @@
 #define VS_UNDERLINE_WIDTH  57
 #define VS_UNDERLINE_HEIGHT  12 * 10
 
-#define IMG_SPACING_D               71
-
 //popup window underline
 #define VS_UNDERLINE            1
 #define PB_OPTIONS              2
-#define BMP_UNDERLINE_MORE      3
 
 #define IMG_SINGLE              10
 #define IMG_DOUBLE              11
@@ -110,46 +107,6 @@
 #define STR_PT                      74
 
 //help ids
-#define HID_COMBO_FONT_NAME             "SVX_HID_COMBO_FONT_NAME"
-#define HID_METRIC_FONT_SIZE            "SVX_HID_METRIC_FONT_SIZE"
-#define HID_TB_INCREASE_DECREASE        "SVX_HID_TB_INCREASE_DECREASE"
-#define HID_TBI_INCREASE                "SVX_HID_TBI_INCREASE"
-#define HID_TBI_DECREASE                "SVX_HID_TBI_DECREASE"
-#define HID_TB_FONT                     "SVX_HID_TB_FONT"
-#define HID_TBI_FONT_BOLD               "SVX_HID_TBI_FONT_BOLD"
-#define HID_TBI_FONT_ITALIC             "SVX_HID_TBI_FONT_ITALIC"
-#define HID_TBI_FONT_UNDERLINE          "SVX_HID_TBI_FONT_UNDERLINE"
-#define HID_TBI_FONT_STRIKEOUT          "SVX_HID_TBI_FONT_STRIKEOUT"
-#define HID_TBI_FONT_SHADOWED           "SVX_HID_TBI_FONT_SHADOWED"
-#define HID_TB_COLOR                    "SVX_HID_TB_COLOR"
-#define HID_TBI_COLOR                   "SVX_HID_TBI_COLOR"
-#define HID_TB_SCRIPT                   "SVX_HID_TB_SCRIPT"
-#define HID_TBI_SCRIPT_SUPER            "SVX_HID_TBI_SCRIPT_SUPER"
-#define HID_TBI_SCRIPT_SUB              "SVX_HID_TBI_SCRIPT_SUB"
-#define HID_TB_SCRIPT_SW                "SVX_HID_TB_SCRIPT_SW"
-#define HID_TBI_SCRIPT_SW_SUPER         "SVX_HID_TBI_SCRIPT_SW_SUPER"
-#define HID_TBI_SCRIPT_SW_SUB           "SVX_HID_TBI_SCRIPT_SW_SUB"
-#define HID_TB_SPACING                  "SVX_HID_TB_SPACING"
-#define HID_TBI_SPACING                 "SVX_HID_TBI_SPACING"
-#define HID_TB_HIGHLIGHT                "SVX_HID_TB_HIGHLIGHT"
-#define HID_TBI_HIGHLIGHT               "SVX_HID_TBI_HIGHLIGHT"
-
-#define HID_UNDERLINE_VS                "SVX_HID_UNDERLINE_VS"
 #define HID_UNDERLINE_BTN               "SVX_HID_UNDERLINE_BTN"
-
-#define HID_COLOR_VS                    "SVX_HID_COLOR_VS"
-
-#define HID_SPACING_TB_VERY_LOOSE       "SVX_HID_SPACING_TB_VERY_LOOSE"
-#define HID_SPACING_TBI_VERY_LOOSE      "SVX_HID_SPACING_TBI_VERY_LOOSE"
-#define HID_SPACING_TB_LOOSE            "SVX_HID_SPACING_TB_LOOSE"
-#define HID_SPACING_TBI_LOOSE           "SVX_HID_SPACING_TBI_LOOSE"
-#define HID_SPACING_TB_NORMAL           "SVX_HID_SPACING_TB_NORMAL"
-#define HID_SPACING_TBI_NORMAL          "SVX_HID_SPACING_TBI_NORMAL"
-#define HID_SPACING_TB_TIGHT            "SVX_HID_SPACING_TB_TIGHT"
-#define HID_SPACING_TBI_TIGHT           "SVX_HID_SPACING_TBI_TIGHT"
-#define HID_SPACING_TB_VERY_TIGHT       "SVX_HID_SPACING_TB_VERY_TIGHT"
-#define HID_SPACING_TBI_VERY_TIGHT      "SVX_HID_SPACING_TBI_VERY_TIGHT"
-#define HID_SPACING_TB_CUSTOM           "SVX_HID_SPACING_TB_CUSTOM"
-#define HID_SPACING_TBI_CUSTOM          "SVX_HID_SPACING_TBI_CUSTOM"
 #define HID_SPACING_CB_KERN             "SVX_HID_SPACING_CB_KERN"
 #define HID_SPACING_MB_KERN             "SVX_HID_SPACING_MB_KERN"
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index f65d468b3310..e75e234f340c 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -18,7 +18,6 @@
 #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTPROPERTYPANEL_HXX
 #define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTPROPERTYPANEL_HXX
 
-#include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
@@ -34,9 +33,7 @@
 #include "TextCharacterSpacingPopup.hxx"
 #include "TextUnderlinePopup.hxx"
 #include <svx/sidebar/PanelLayout.hxx>
-#include <vcl/vclenum.hxx>
 
-class FloatingWindow;
 class ToolBox;
 
 namespace svx { namespace sidebar {
@@ -84,7 +81,6 @@ private:
     FontSizeBox* mpFontSizeBox;
     ToolBox* mpToolBoxFont;
     ToolBox* mpToolBoxIncDec;
-    ToolBox* mpToolBoxScript;
     ToolBox* mpToolBoxSpacing;
     ToolBox* mpToolBoxFontColor;
 
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 9e57a5d15b60..89e9ca676340 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -20,8 +20,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
-#include <unotools/viewoptions.hxx>
-#include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <editeng/udlnitem.hxx>
diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx
index 05caf06b56f2..c55d6ca58bde 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.hxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.hxx
@@ -21,12 +21,8 @@
 
 #include "svx/sidebar/PopupControl.hxx"
 #include <sfx2/bindings.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svtools/ctrltool.hxx>
 #include "TextPropertyPanel.hxx"
-#include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-
 #include <vcl/vclenum.hxx>
 #include <svtools/valueset.hxx>
 
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui
index ae9038b2ac3b..c17f141206f0 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -66,7 +66,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Bold</property>
                     <property name="use_underline">True</property>
@@ -81,7 +80,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Italic</property>
                     <property name="use_underline">True</property>
@@ -96,7 +94,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Underline</property>
                     <property name="use_underline">True</property>
@@ -111,7 +108,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Strikeout</property>
                     <property name="use_underline">True</property>
@@ -126,7 +122,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Shadowed</property>
                     <property name="use_underline">True</property>
@@ -153,7 +148,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Grow</property>
                     <property name="use_underline">True</property>
@@ -168,7 +162,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Shrink</property>
                     <property name="use_underline">True</property>
@@ -208,7 +201,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Color</property>
                     <property name="use_underline">True</property>
@@ -223,7 +215,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:FontColor</property>
                     <property name="use_underline">True</property>
@@ -238,7 +229,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:BackColor</property>
                     <property name="use_underline">True</property>
@@ -265,7 +255,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="action_name">.uno:SuperScript</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -279,7 +268,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="action_name">.uno:SubScript</property>
                     <property name="use_underline">True</property>
                   </object>
@@ -305,7 +293,6 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="is_important">True</property>
                     <property name="action_name">.uno:Spacing</property>
                     <property name="use_underline">True</property>