XubString->OUString

Change-Id: I1db6254b23c5203c20c168989656d320f86a3bb9

6 files changed, 26 insertions, 27 deletions

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index fabb2086ea27..865377fee8ec 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -126,13 +126,13 @@ void ParaLineSpacingControl::initial()
     mpImgSel[2] = maSelSpacing15;
     mpImgSel[3] = maSelSpacing2;
 
-    mpStr = new XubString[4];
+    mpStr = new OUString[4];
     mpStr[0] = SVX_RESSTR(STR_SPACING1);
     mpStr[1] = SVX_RESSTR(STR_SPACING115);
     mpStr[2] = SVX_RESSTR(STR_SPACING15);
     mpStr[3] = SVX_RESSTR(STR_SPACING2);
 
-    mpStrTip = new XubString[4];
+    mpStrTip = new OUString[4];
     mpStrTip[0] = SVX_RESSTR(STR_LS_SINGLE);
     mpStrTip[1] = SVX_RESSTR(STR_LS_115);
     mpStrTip[2] = SVX_RESSTR(STR_LS_15);
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index fc540c044971..2e29e8b2af00 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -88,12 +88,12 @@ private:
     Image  maSelSelHanging;
     Image               maImgCus;
     Image               maImgCusGrey;
-    XubString           maStrCus;
+    OUString            maStrCus;
 
     Image*              mpImg;
     Image*              mpImgSel;
-    XubString*          mpStr;
-    XubString*          mpStrTip;
+    OUString*           mpStr;
+    OUString*           mpStrTip;
     String              maLine;
     String              maOf;
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 1f8b7222371f..bf5dd418ec67 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -111,7 +111,7 @@ void TextCharacterSpacingControl::initial()
     mpImgSel[3] = Image(SVX_RES(IMG_LOOSE_S));
     mpImgSel[4] = Image(SVX_RES(IMG_VERY_LOOSE_S));
 
-    mpStr = new XubString[5];
+    mpStr = new OUString[5];
     mpStr[0] = SVX_RESSTR(STR_VERY_TIGHT);
     mpStr[1] = SVX_RESSTR(STR_TIGHT);
     mpStr[2] = SVX_RESSTR(STR_NORMAL);
@@ -119,7 +119,7 @@ void TextCharacterSpacingControl::initial()
     mpStr[4] = SVX_RESSTR(STR_VERY_LOOSE);
 
 
-    mpStrTip = new XubString[5];
+    mpStrTip = new OUString[5];
     mpStrTip[0] = SVX_RESSTR(STR_VERY_TIGHT_TIP);
     mpStrTip[1] = SVX_RESSTR(STR_TIGHT_TIP);
     mpStrTip[2] = SVX_RESSTR(STR_NORMAL_TIP);
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index f876f794562c..b47af09d9c9f 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -61,7 +61,6 @@ private:
     ValueSetWithTextControl maVSSpacing;
 
     FixedText           maLastCus;
-//  Control             maBorder;
 
     FixedText           maFTSpacing;
     ListBox             maLBKerning;
@@ -70,16 +69,16 @@ private:
 
     Image*              mpImg;
     Image*              mpImgSel;
-    XubString*          mpStr;
-    XubString*          mpStrTip;
+    OUString*           mpStr;
+    OUString*           mpStrTip;
 
     Image               maImgCus;
     Image               maImgCusGrey;
-    XubString           maStrCus;
-    XubString           maStrCusE;      //add
-    XubString           maStrCusC;      //add
-    XubString           maStrCusN;      //add
-    XubString           maStrUnit;      //add
+    OUString            maStrCus;
+    OUString            maStrCusE;
+    OUString            maStrCusC;
+    OUString            maStrCusN;
+    OUString            maStrUnit;
 
     long                mnCustomKern;
     short               mnLastCus;
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 91a1848a3b8d..37b5324b010a 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -88,8 +88,8 @@ ValueSetWithTextControl::~ValueSetWithTextControl(void)
 void ValueSetWithTextControl::AddItem(
     const Image& rItemImage,
     const Image* pSelectedItemImage,
-    const XubString& rItemText,
-    const XubString* pItemHelpText )
+    const OUString& rItemText,
+    const OUString* pItemHelpText )
 {
     if ( meControlType != IMAGE_TEXT )
     {
@@ -112,9 +112,9 @@ void ValueSetWithTextControl::AddItem(
 
 
 void ValueSetWithTextControl::AddItem(
-    const XubString& rItemText,
-    const XubString& rItemText2,
-    const XubString* pItemHelpText )
+    const OUString& rItemText,
+    const OUString& rItemText2,
+    const OUString* pItemHelpText )
 {
     if ( meControlType != TEXT_TEXT )
     {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 1c6fb1f3e0c6..1c7bf49b50a8 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -540,7 +540,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
     return bChgd;
 }
 
-const XubString& SdrMarkList::GetMarkDescription() const
+const OUString& SdrMarkList::GetMarkDescription() const
 {
     sal_uLong nAnz(GetMarkCount());
 
@@ -563,7 +563,7 @@ const XubString& SdrMarkList::GetMarkDescription() const
 
         if(!nAnz)
         {
-            ((SdrMarkList*)(this))->maMarkName = ImpGetResStr(STR_ObjNameNoObj);
+            const_cast<SdrMarkList*>(this)->maMarkName = ImpGetResStr(STR_ObjNameNoObj);
         }
         else if(1L == nAnz)
         {
@@ -596,17 +596,17 @@ const XubString& SdrMarkList::GetMarkDescription() const
             aNam.Insert(OUString::number( nAnz ), 0);
         }
 
-        ((SdrMarkList*)(this))->maMarkName = aNam;
-        ((SdrMarkList*)(this))->mbNameOk = sal_True;
+        const_cast<SdrMarkList*>(this)->maMarkName = aNam;
+        const_cast<SdrMarkList*>(this)->mbNameOk = sal_True;
     }
 
     return maMarkName;
 }
 
-const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
+const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
 {
     sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
-    XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName);
+    OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName);
     sal_uLong nMarkAnz(GetMarkCount());
     sal_uLong nMarkPtAnz(0L);
     sal_uLong nMarkPtObjAnz(0L);
@@ -650,7 +650,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
 
     if(!nMarkPtObjAnz)
     {
-        rName.Erase();
+        rName = OUString();
         rNameOk = sal_True;
     }
     else if(!rNameOk)