From 38ecca9b30e0fc5f7cc6264857f983e40dd58195 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 24 Jul 2015 16:22:29 +0200 Subject: inline a bunch of use-once macros no point in having a macro unless it's actually going to reduce the number of lines of code Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc --- chart2/source/inc/RegressionCalculationHelper.hxx | 4 ---- chart2/source/tools/RegressionCurveCalculator.cxx | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'chart2/source') diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx index 7f0a69368467..933f14e45ed0 100644 --- a/chart2/source/inc/RegressionCalculationHelper.hxx +++ b/chart2/source/inc/RegressionCalculationHelper.hxx @@ -26,12 +26,8 @@ #include #include -#define NUMBER_TO_STR(number) (OStringToOUString(::rtl::math::doubleToString( \ - number, rtl_math_StringFormat_G1, 4, '.', true ),RTL_TEXTENCODING_ASCII_US )) - #define UC_SPACE (sal_Unicode(' ')) #define UC_MINUS_SIGN (sal_Unicode('-')) -// #define UC_MINUS_SIGN (sal_Unicode(0x2212)) namespace chart { diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index d8dc8c7916a2..1ecb681d8289 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -89,7 +89,9 @@ OUString RegressionCurveCalculator::getFormattedString( if( xNumFormatter.is()) aResult = xNumFormatter->convertNumberToString( nNumberFormatKey, fNumber ); else - aResult = NUMBER_TO_STR( fNumber ); + aResult = OStringToOUString( + ::rtl::math::doubleToString( fNumber, rtl_math_StringFormat_G1, 4, '.', true ), + RTL_TEXTENCODING_ASCII_US ); return aResult; } -- cgit v1.2.3