diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-05 20:35:37 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 19:57:22 -0600 |
| commit | 6dbf5f7ea0187aa6c4e1c45fc2d2cd03b2b67b0a (patch) | |
| tree | d5c43520cc675e80e08aecf24a73efc94a81b02a /svl/source/numbers/zforscan.cxx | |
| parent | 4e6a7df7c53389b043274be37b17679bd456d89d (diff) | |
svl: convert Color to OUString
Change-Id: Icaa3e29fbd5674271e69fa17ed9249c65b4a9c40
Diffstat (limited to 'svl/source/numbers/zforscan.cxx')
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 86e9ba62f066..c81ac8b0897c 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -453,7 +453,7 @@ void ImpSvNumberformatScan::ChangeStandardPrec(sal_uInt16 nPrec) nStandardPrec = nPrec; } -Color* ImpSvNumberformatScan::GetColor(String& sStr) +Color* ImpSvNumberformatScan::GetColor(OUString& sStr) { OUString sString = pFormatter->GetCharClass()->uppercase(sStr); const NfKeywordTable & rKeyword = GetKeywords(); @@ -483,17 +483,17 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr) sal_Int32 nPos = sString.startsWith(rColorWord); if (nPos > 0) { - sStr.Erase(0, nPos); + sStr = sStr.copy(nPos); sStr = comphelper::string::strip(sStr, ' '); if (bConvertMode) { pFormatter->ChangeIntl(eNewLnge); - sStr.Insert( GetKeywords()[NF_KEY_COLOR], 0 ); // Color -> FARBE + sStr = GetKeywords()[NF_KEY_COLOR] + sStr; // Color -> FARBE pFormatter->ChangeIntl(eTmpLnge); } else { - sStr.Insert(rColorWord,0); + sStr = rColorWord + sStr; } sString = sString.copy(nPos); sString = comphelper::string::strip(sString, ' '); @@ -510,7 +510,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr) } else { - sStr.Erase(); + sStr = ""; if (bConvertMode) { pFormatter->ChangeIntl(eNewLnge); |