diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-05 16:25:03 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-07 20:00:16 +0000 |
| commit | 009851223b5ced4ed2662af2e2ae81c0f9200e45 (patch) | |
| tree | a8ab339589ea23b98513d394eabc4f135e69ccae /svl/source/numbers/zformat.cxx | |
| parent | 35b42a9d1282a92dbc9a7fbc51d279812070688c (diff) | |
module svl: all String and some bool and related clean-up
Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed
Reviewed-on: https://gerrit.libreoffice.org/4733
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'svl/source/numbers/zformat.cxx')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 720ea8727953..abaf36b068b5 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1919,7 +1919,7 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, // static OUString SvNumberformat::LoadString( SvStream& rStream ) { - CharSet eStream = rStream.GetStreamCharSet(); + rtl_TextEncoding eStream = rStream.GetStreamCharSet(); OString aStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if (aStr.indexOf(cStream) < 0) @@ -5024,7 +5024,7 @@ Color* SvNumberformat::GetColor( sal_uInt16 nNumFor ) const static void lcl_SvNumberformat_AddLimitStringImpl( OUString& rStr, SvNumberformatLimitOps eOp, - double fLimit, const String& rDecSep ) + double fLimit, const OUString& rDecSep ) { if ( eOp != NUMBERFORMAT_OP_NO ) { @@ -5054,7 +5054,7 @@ static void lcl_SvNumberformat_AddLimitStringImpl( OUString& rStr, } rStr += ::rtl::math::doubleToUString( fLimit, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, - rDecSep.GetChar(0), true); + rDecSep[0], true); rStr += "]"; } } |