convert svx/.../sidebar/*.hxx from String to OUString

Change-Id: Id50f78d33608d76bf5142597d9cf2434ab03702d

9 files changed, 53 insertions, 53 deletions

diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 02904283a3b6..bc51381446ac 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -528,7 +528,7 @@ IMPL_LINK(AreaPropertyPanel, ToolBoxColorDropHdl, ToolBox*, pToolBox)
 
 
 void AreaPropertyPanel::SetColor (
-    const String& rsColorName,
+    const OUString& rsColorName,
     const Color aColor)
 {
     const XFillColorItem aXFillColorItem(rsColorName, aColor);
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 39cbafca4546..105491f53a56 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -136,8 +136,8 @@ private:
     Image                                               maImgLinear;
     Image                                               maImgColor;
 
-    String                                              msHelpFillType;
-    String                                              msHelpFillAttr;
+    OUString                                            msHelpFillType;
+    OUString                                            msHelpFillAttr;
 
     AreaTransparencyGradientPopup maTrGrPopup;
     ColorPopup maColorPopup;
@@ -179,7 +179,7 @@ private:
 
     Color GetLastColor (void) const;
     void SetColor (
-        const String& rsColorName,
+        const OUString& rsColorName,
         const Color aColor);
 };
 
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 2ad4d41288d2..6c9168c144a2 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -74,10 +74,10 @@ private:
     ::sfx2::sidebar::ControllerItem                     maGammaControl;
     ::sfx2::sidebar::ControllerItem                     maModeControl;
 
-    String                                              msNormal;
-    String                                              msBW;
-    String                                              msGray;
-    String                                              msWater;
+    OUString                                            msNormal;
+    OUString                                            msBW;
+    OUString                                            msGray;
+    OUString                                            msWater;
 
     cssu::Reference<css::frame::XFrame>                 mxFrame;
     SfxBindings*                                        mpBindings;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 57cb65d77d47..0563dcfdf951 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -963,7 +963,7 @@ void LinePropertyPanel::SetWidthIcon()
 
 
 void LinePropertyPanel::SetColor (
-    const String& rsColorName,
+    const OUString& rsColorName,
     const Color aColor)
 {
     XLineColorItem aColorItem(rsColorName, aColor);
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 493bcfbf7044..319e7f03c2b5 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -47,7 +47,7 @@ class ToolBox;
 class FloatingWindow;
 
 namespace {
-    #define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE String("PopupPanel_LineWidth", 20, RTL_TEXTENCODING_ASCII_US)
+    #define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth"
 } //end of anonymous namespace
 
 namespace svx { namespace sidebar {
@@ -175,7 +175,7 @@ private:
     virtual ~LinePropertyPanel(void);
 
     void SetColor(
-        const String& rsColorName,
+        const OUString& rsColorName,
         const Color aColor);
 
     PopupControl* CreateColorPopupControl (PopupContainer* pParent);
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index 2e29e8b2af00..a841f8af1861 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -32,8 +32,8 @@
 
 namespace svx { namespace sidebar {
 
-#define LSP_POS_GLOBAL_VALUE    String("Line_Spacing_Pos", 16, RTL_TEXTENCODING_ASCII_US)
-#define LSP_LV_GLOBAL_VALUE     String("Line_Spacing_Lv", 15, RTL_TEXTENCODING_ASCII_US)
+#define LSP_POS_GLOBAL_VALUE   "Line_Spacing_Pos"
+#define LSP_LV_GLOBAL_VALUE    "Line_Spacing_Lv"
 #define BEGIN_VALUE            28
 class ParaLineSpacingControl:public svx::sidebar::PopupControl
 {
@@ -59,46 +59,46 @@ public:
 private:
     bool                    mbUseLineSPCustom;
     bool                    mbLineSPDisable;
-    SfxMapUnit                      m_eLNSpaceUnit;
-    ParaPropertyPanel&     mrParaPropertyPanel;
-    SfxBindings*        mpBindings;
+    SfxMapUnit              m_eLNSpaceUnit;
+    ParaPropertyPanel&      mrParaPropertyPanel;
+    SfxBindings*            mpBindings;
 
-    long                            nMinFixDist;
-    Edit*                           pActLineDistFld;
+    long                    nMinFixDist;
+    Edit*                   pActLineDistFld;
 
     ValueSetWithTextControl maLineSpacing;
 
-    FixedText maCustomFT;
-    FixedText maLSpacingFT;
-    ListBox                         aLineDist;
-
-    FixedText maOfFT;
-    MetricField                     aLineDistAtPercentBox;
-    MetricField                     aLineDistAtMetricBox;
-
-    Image  maSpacing1;
-    Image  maSpacing115;
-    Image  maSpacing15;
-    Image  maSpacing2;
-
-    Image  maSelSpacing1;
-    Image  maSelSpacing115;
-    Image  maSelSpacing15;
-    Image  maSelSpacing2;
-    Image  maSelSelHanging;
-    Image               maImgCus;
-    Image               maImgCusGrey;
-    OUString            maStrCus;
-
-    Image*              mpImg;
-    Image*              mpImgSel;
-    OUString*           mpStr;
-    OUString*           mpStrTip;
-    String              maLine;
-    String              maOf;
-
-    sal_Int64             maValue;
-    sal_uInt16                maPos;
+    FixedText               maCustomFT;
+    FixedText               maLSpacingFT;
+    ListBox                 aLineDist;
+
+    FixedText               maOfFT;
+    MetricField             aLineDistAtPercentBox;
+    MetricField             aLineDistAtMetricBox;
+
+    Image                   maSpacing1;
+    Image                   maSpacing115;
+    Image                   maSpacing15;
+    Image                   maSpacing2;
+
+    Image                   maSelSpacing1;
+    Image                   maSelSpacing115;
+    Image                   maSelSpacing15;
+    Image                   maSelSpacing2;
+    Image                   maSelSelHanging;
+    Image                   maImgCus;
+    Image                   maImgCusGrey;
+    OUString                maStrCus;
+
+    Image*                  mpImg;
+    Image*                  mpImgSel;
+    OUString*               mpStr;
+    OUString*               mpStrTip;
+    OUString                maLine;
+    OUString                maOf;
+
+    sal_Int64               maValue;
+    sal_uInt16              maPos;
 private:
     void initial();
     DECL_LINK(LineSPDistHdl_Impl, ListBox*);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 9574ea39c819..accc3d7034f3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -651,7 +651,7 @@ void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /*nSID*/, SfxItemState eS
 }
 
 void ParaPropertyPanel::SetBGColor (
-    const String& /*rsColorName*/,
+    const OUString& /*rsColorName*/,
     const Color aColor)
 {
     SvxColorItem aColorItem(aColor, SID_BACKGROUND_COLOR);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 5577ef4f7f69..8b85c91ce771 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -239,7 +239,7 @@ private:
     void InitToolBoxSpacing();
     void InitToolBoxLineSpacing();
 
-    void SetBGColor (const String& rsColorName, const Color aColor);
+    void SetBGColor (const OUString& rsColorName, const Color aColor);
 };
 
 } } // end of namespace ::svx::sidebar
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index 558399f2febc..8c5fa2fbd18a 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -34,8 +34,8 @@ class SvxSBFontNameBox : public FontNameBox//, public SfxListener
 private:
     const FontList* pFontList;
     Font            aCurFont;
-    String          aCurText;
-    sal_uInt16 nFtCount;
+    OUString        aCurText;
+    sal_uInt16      nFtCount;
     void            EnableControls_Impl();
     SfxBindings*    pBindings;//
 protected: