diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-03-12 10:41:57 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-12 11:54:47 +0000 |
commit | a67d0193ff3a4a317ca4a65045fcd2ae244560c6 (patch) | |
tree | 9e93808df1109ef435ebc5a028f37a1d5fa76c72 /svtools/source | |
parent | ecdd44e8f577e51e0208e9f421704a70041f1be8 (diff) |
XubString->OUString
Change-Id: Ie2b0060155eaeb4c8979731dd4c62bc269f7c501
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 48 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 4 |
2 files changed, 26 insertions, 26 deletions
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; } } |