summaryrefslogtreecommitdiff
path: root/chart2/source/tools/NumberFormatterWrapper.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2013-07-05 16:25:03 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-07-07 20:00:16 +0000
commit009851223b5ced4ed2662af2e2ae81c0f9200e45 (patch)
treea8ab339589ea23b98513d394eabc4f135e69ccae /chart2/source/tools/NumberFormatterWrapper.cxx
parent35b42a9d1282a92dbc9a7fbc51d279812070688c (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 'chart2/source/tools/NumberFormatterWrapper.cxx')
-rw-r--r--chart2/source/tools/NumberFormatterWrapper.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index a1080b34c792..9a7db0691e5d 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -99,10 +99,10 @@ Date NumberFormatterWrapper::getNullDate() const
return aRet;
}
-OUString NumberFormatterWrapper::getFormattedString(
- sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
+OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, double fValue,
+ sal_Int32& rLabelColor, bool& rbColorChanged ) const
{
- String aText;
+ OUString aText;
Color* pTextColor = NULL;
if( !m_pNumberFormatter )
{
@@ -124,13 +124,11 @@ OUString NumberFormatterWrapper::getFormattedString(
m_aNullDate >>= aNewNullDate;
m_pNumberFormatter->ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year);
}
- m_pNumberFormatter->GetOutputString(
- fValue, nNumberFormatKey, aText, &pTextColor);
+ m_pNumberFormatter->GetOutputString(fValue, nNumberFormatKey, aText, &pTextColor);
if ( m_aNullDate.hasValue() )
{
m_pNumberFormatter->ChangeNullDate(nDay,nMonth,nYear);
}
- OUString aRet( aText );
if(pTextColor)
{
@@ -140,7 +138,7 @@ OUString NumberFormatterWrapper::getFormattedString(
else
rbColorChanged = false;
- return aRet;
+ return aText;
}
//.............................................................................