summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-07-24 16:22:29 +0200
committerNoel Grandin <noel@peralex.com>2015-07-27 08:18:16 +0200
commit38ecca9b30e0fc5f7cc6264857f983e40dd58195 (patch)
tree3ad61e6d5cddcf161d27cfe4c6ca85fcf1cab8f6 /chart2
parentefac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 (diff)
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
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/inc/RegressionCalculationHelper.hxx4
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx4
2 files changed, 3 insertions, 5 deletions
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 <functional>
#include <vector>
-#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;
}