XubString->OUString

Change-Id: Ie2b0060155eaeb4c8979731dd4c62bc269f7c501

4 files changed, 35 insertions, 35 deletions

diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index b7cbc165157b..8486926e53a9 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -295,17 +295,17 @@ protected:
 //------------------------------------------------------------------------------
 class DoubleCurrencyField : public FormattedField
 {
-    XubString   m_sCurrencySymbol;
-    sal_Bool        m_bPrependCurrSym;
-    sal_Bool        m_bChangingFormat;
+    OUString   m_sCurrencySymbol;
+    sal_Bool   m_bPrependCurrSym;
+    sal_Bool   m_bChangingFormat;
 
 public:
     DoubleCurrencyField(Window* pParent, WinBits nStyle = 0);
 
-    XubString   getCurrencySymbol() const { return m_sCurrencySymbol; }
-    void        setCurrencySymbol(const XubString& _sSymbol);
+    OUString    getCurrencySymbol() const { return m_sCurrencySymbol; }
+    void        setCurrencySymbol(const OUString& rSymbol);
 
-    sal_Bool        getPrependCurrSym() const { return m_bPrependCurrSym; }
+    sal_Bool    getPrependCurrSym() const { return m_bPrependCurrSym; }
     void        setPrependCurrSym(sal_Bool _bPrepend);
 
 protected:
diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
index c7dbd56e7f52..0a950081c20d 100644
--- a/svtools/inc/svtools/tabbar.hxx
+++ b/svtools/inc/svtools/tabbar.hxx
@@ -339,7 +339,7 @@ private:
     ImplTabButton*  mpLastBtn;
     TabBar_Impl*    mpImpl;
     TabBarEdit*     mpEdit;
-    XubString       maEditText;
+    OUString        maEditText;
     Color           maSelColor;
     Color           maSelTextColor;
     Size            maWinSize;
@@ -476,8 +476,8 @@ public:
     sal_Bool            IsEditModeEnabled() const { return mbAutoEditMode; }
     sal_Bool            StartEditMode( sal_uInt16 nPageId );
     void            EndEditMode( sal_Bool bCancel = sal_False );
-    void            SetEditText( const XubString& rText ) { maEditText = rText; }
-    const XubString& GetEditText() const { return maEditText; }
+    void            SetEditText( const OUString& rText ) { maEditText = rText; }
+    const OUString& GetEditText() const { return maEditText; }
     sal_Bool            IsInEditMode() const { return (mpEdit != NULL); }
     sal_Bool            IsEditModeCanceled() const { return mbEditCanceled; }
     sal_uInt16          GetEditPageId() const { return mnEditId; }
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 0b2c3e4c55dc..697075e93a2b 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -1209,12 +1209,12 @@ void DoubleCurrencyField::FormatChanged(FORMAT_CHANGE_TYPE nWhat)
 }
 
 //------------------------------------------------------------------------------
-void DoubleCurrencyField::setCurrencySymbol(const String& _sSymbol)
+void DoubleCurrencyField::setCurrencySymbol(const OUString& rSymbol)
 {
-    if (m_sCurrencySymbol == _sSymbol)
+    if (m_sCurrencySymbol == rSymbol)
         return;
 
-    m_sCurrencySymbol  = _sSymbol;
+    m_sCurrencySymbol = rSymbol;
     UpdateCurrencyFormat();
     FormatChanged(FCT_CURRENCY_SYMBOL);
 }
@@ -1248,61 +1248,61 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
     LanguageTag aLanguageTag( eLanguage);
     LocaleDataWrapper aLocaleInfo( aLanguageTag );
 
-    XubString sNewFormat;
+    OUStringBuffer sNewFormat;
     if (bThSep)
     {
-        sNewFormat = '#';
-        sNewFormat += aLocaleInfo.getNumThousandSep();
-        sNewFormat.AppendAscii("##0");
+        sNewFormat.append('#');
+        sNewFormat.append(aLocaleInfo.getNumThousandSep());
+        sNewFormat.append("##0");
     }
     else
-        sNewFormat = '0';
+        sNewFormat.append('0');
 
     if (nDigits)
     {
-        sNewFormat += aLocaleInfo.getNumDecimalSep();
+        sNewFormat.append(aLocaleInfo.getNumDecimalSep());
 
         rtl::OUStringBuffer sTemp;
         comphelper::string::padToLength(sTemp, nDigits, '0');
-        sNewFormat += sTemp.makeStringAndClear();
+        sNewFormat.append(sTemp);
     }
 
     if (getPrependCurrSym())
     {
-        XubString sSymbol = getCurrencySymbol();
+        OUString sSymbol = getCurrencySymbol();
         sSymbol = comphelper::string::stripStart(sSymbol, ' ');
         sSymbol = comphelper::string::stripEnd(sSymbol, ' ');
 
-        XubString sTemp = rtl::OUString("[$");
-        sTemp += sSymbol;
-        sTemp.AppendAscii("] ");
-        sTemp += sNewFormat;
+        OUStringBuffer sTemp("[$");
+        sTemp.append(sSymbol);
+        sTemp.append("] ");
+        sTemp.append(sNewFormat);
 
         // for negative values : $ -0.00, not -$ 0.00 ...
         // (the real solution would be a possibility to choose a "positive currency format" and a "negative currency format" ...
         // But not now ... (and hey, you could take a formatted field for this ....))
         // FS - 31.03.00 74642
-        sTemp.AppendAscii(";[$");
-        sTemp += sSymbol;
-        sTemp.AppendAscii("] -");
-        sTemp += sNewFormat;
+        sTemp.append(";[$");
+        sTemp.append(sSymbol);
+        sTemp.append("] -");
+        sTemp.append(sNewFormat);
 
         sNewFormat = sTemp;
     }
     else
     {
-        XubString sTemp = getCurrencySymbol();
+        OUString sTemp = getCurrencySymbol();
         sTemp = comphelper::string::stripStart(sTemp, ' ');
         sTemp = comphelper::string::stripEnd(sTemp, ' ');
 
-        sNewFormat += rtl::OUString(" [$");
-        sNewFormat += sTemp;
-        sNewFormat += ']';
+        sNewFormat.append(" [$");
+        sNewFormat.append(sTemp);
+        sNewFormat.append(']');
     }
 
     // set this new basic format
     m_bChangingFormat = sal_True;
-    SetFormat(sNewFormat, eLanguage);
+    SetFormat(sNewFormat.makeStringAndClear(), eLanguage);
     m_bChangingFormat = sal_False;
 }
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 046cf5f0a271..34ab2900a024 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2405,8 +2405,8 @@ void TabBar::EndEditMode( sal_Bool bCancel )
         }
 
         // reset
-        maEditText.Erase();
-        mbEditCanceled = sal_False;
+        maEditText = OUString();
+        mbEditCanceled = false;
     }
 }