diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-08 13:04:02 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-08 13:35:19 +0200 |
commit | 4df2bc90cc7bef84a826b8d261c08e71c3e1887d (patch) | |
tree | 12f22011fc7d2df47cd0a43d40e7ccf9406d477c | |
parent | 21864fed063c1888323e14977fc73061d4905b80 (diff) |
A newline is not that special or hard to remember
Change-Id: I2960a59283a5a04c5c804a57e43bdb633c0e45cf
-rw-r--r-- | chart2/inc/SpecialUnicodes.hxx | 1 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/ObjectNameProvider.cxx | 6 | ||||
-rw-r--r-- | chart2/source/tools/RegressionCurveCalculator.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/chart2/inc/SpecialUnicodes.hxx b/chart2/inc/SpecialUnicodes.hxx index 22ddc35b5e39..bbd1df6d51ec 100644 --- a/chart2/inc/SpecialUnicodes.hxx +++ b/chart2/inc/SpecialUnicodes.hxx @@ -11,7 +11,6 @@ #define INCLUDED_CHART2_INC_SPECIALUNICODES_HXX const sal_Unicode aMinusSign = 0x2212; -const OUString aNewLine ("\n"); const OUString aHashString ("###"); const sal_Unicode aSuperscriptFigures[10]={ 0x2070, 0x00B9, 0x00B2, 0x00B3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079 }; diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 6e112ae9fa5c..157ca9106d3c 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -487,10 +487,8 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { if( bVerbose ) { - OUString aNewLine( "\n" ); - - aRet= SCH_RESSTR(STR_TIP_DATAPOINT_INDEX) + aNewLine - + SCH_RESSTR(STR_TIP_DATASERIES) + aNewLine + aRet= SCH_RESSTR(STR_TIP_DATAPOINT_INDEX) + "\n" + + SCH_RESSTR(STR_TIP_DATASERIES) + "\n" + SCH_RESSTR(STR_TIP_DATAPOINT_VALUES); } else diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 5174b3d79ffc..4911078deac7 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -200,7 +200,7 @@ void RegressionCurveCalculator::addStringToEquation( { if ( pMaxWidth && ( nLineLength + aAddString.getLength() > *pMaxWidth ) ) { // wrap line - aStrEquation.append( aNewLine + " " ); // start new line with a blank + aStrEquation.append( "\n " ); // start new line with a blank nLineLength = 1; } aStrEquation.append( aAddString ); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 35bbe6fb74ce..afbe531b9601 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -1214,7 +1214,7 @@ sal_Int32 lcl_getOUStringMaxLineLength ( OUStringBuffer& aString ) for ( sal_Int32 i=0; i<nStringLength; i++ ) { - sal_Int32 indexSep = aString.indexOf( aNewLine, i ); + sal_Int32 indexSep = aString.indexOf( "\n", i ); if ( indexSep < 0 ) indexSep = nStringLength; sal_Int32 nLineLength = indexSep - i; @@ -1281,7 +1281,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( if( bShowCorrCoeff ) { - aFormula.append( aNewLine ); + aFormula.append( "\n" ); } } if( bShowCorrCoeff ) |