From 8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 16 Oct 2019 15:06:23 +0200 Subject: Rename OUStringLiteral1 to OUStringChar It started out as a wrapper around character literals, but has by now become a wrapper around arbitrary single characters. Besides updating the documentation, this change is a mechanical for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f Reviewed-on: https://gerrit.libreoffice.org/80892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- chart2/qa/extras/chart2_trendcalculators.cxx | 8 ++++---- chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 4 ++-- chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 4 ++-- chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 2 +- chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 2 +- chart2/source/view/charttypes/VSeriesPlotter.cxx | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'chart2') diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx index a889b6637eb7..42dce791d83b 100644 --- a/chart2/qa/extras/chart2_trendcalculators.cxx +++ b/chart2/qa/extras/chart2_trendcalculators.cxx @@ -135,7 +135,7 @@ void Chart2TrendCalculators::testPotentialRegression2() xValues[i] = d; yValues[i] = -2.0 * pow ( d, 3 ); } - checkCalculator( xValues, yValues, "f(x) = "+ OUStringLiteral1(aMinusSign) +" 2 x^3"); + checkCalculator( xValues, yValues, "f(x) = "+ OUStringChar(aMinusSign) +" 2 x^3"); } // test y = - 2 X - 5 @@ -151,7 +151,7 @@ void Chart2TrendCalculators::testLinearRegression1() xValues[i] = d; yValues[i] = - 2.0 * d - 5.0 ; } - checkCalculator( xValues, yValues, "f(x) = "+ OUStringLiteral1(aMinusSign) +" 2 x "+ OUStringLiteral1(aMinusSign) +" 5"); + checkCalculator( xValues, yValues, "f(x) = "+ OUStringChar(aMinusSign) +" 2 x "+ OUStringChar(aMinusSign) +" 5"); } // test y = A x ^ B @@ -167,7 +167,7 @@ void Chart2TrendCalculators::testPolynomialRegression1() xValues[i] = d; yValues[i] = - 2.0 * d * d + 4 * d - 5; } - OUString sExpectedFormula( "f(x) = "+ OUStringLiteral1(aMinusSign) +" 2 x" + OUStringLiteral1( aSuperscriptFigures[2] ) + " + 4 x "+ OUStringLiteral1(aMinusSign) +" 5" ); + OUString sExpectedFormula( "f(x) = "+ OUStringChar(aMinusSign) +" 2 x" + OUStringChar( aSuperscriptFigures[2] ) + " + 4 x "+ OUStringChar(aMinusSign) +" 5" ); checkCalculator( xValues, yValues, sExpectedFormula ); } @@ -198,7 +198,7 @@ void Chart2TrendCalculators::testExponentialRegression2() xValues[i] = d; yValues[i] = -2.0 * exp ( 0.3 * d ); } - checkCalculator( xValues, yValues, "f(x) = "+ OUStringLiteral1(aMinusSign) + " 2 exp( 0.3 x )"); + checkCalculator( xValues, yValues, "f(x) = "+ OUStringChar(aMinusSign) + " 2 exp( 0.3 x )"); } diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 42d0480d6b73..2c2b81359355 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -179,7 +179,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation( // if nValueLength not calculated then nullptr sal_Int32* pValueLength = nValueLength ? &nValueLength : nullptr; if ( m_fSign < 0.0 ) - aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " ); + aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " ); if ( bHasIntercept ) { OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fIntercept, pValueLength ); @@ -204,7 +204,7 @@ OUString ExponentialRegressionCurveCalculator::ImplGetRepresentation( } } if ( m_fLogSlope < 0.0 ) - aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " ); + aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " ); if ( bHasLogSlope ) { OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fLogSlope), pValueLength ); diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index aecbc4ed39c9..d164918970ba 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -156,7 +156,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation( { if( m_fSlope < 0.0 ) { - aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " ); + aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " ); } if( bHasSlope ) { @@ -175,7 +175,7 @@ OUString LogarithmicRegressionCurveCalculator::ImplGetRepresentation( } // add intercept value if( m_fIntercept < 0.0 ) - aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " ); + aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " ); OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fIntercept), pValueLength ); if ( aValueString != "0" ) // aValueString may be rounded to 0 if nValueLength is small { diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx index b087fc52cede..8658f6004c1e 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -280,7 +280,7 @@ OUString PolynomialRegressionCurveCalculator::ImplGetRepresentation( { if ( bFindValue ) // if it is not the first aValue aTmpBuf.append( " " ); - aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append(" "); + aTmpBuf.append( OUStringChar(aMinusSign) ).append(" "); aValue = - aValue; } else diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 16b24b47392b..abda608a3c34 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -170,7 +170,7 @@ OUString PotentialRegressionCurveCalculator::ImplGetRepresentation( // if nValueLength not calculated then nullptr sal_Int32* pValueLength = nValueLength ? &nValueLength : nullptr; if ( m_fIntercept < 0.0 ) // add intercept value - aTmpBuf.append( OUStringLiteral1(aMinusSign) ).append( " " ); + aTmpBuf.append( OUStringChar(aMinusSign) ).append( " " ); if( bHasIntercept ) { OUString aValueString = getFormattedString( xNumFormatter, nNumberFormatKey, fabs(m_fIntercept), pValueLength ); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index cacba0bab258..33424056d720 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -1504,7 +1504,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( } if( bShowCorrCoeff ) { - aFormula.append( "R" ).append( OUStringLiteral1( aSuperscriptFigures[2] ) ).append( " = " ); + aFormula.append( "R" ).append( OUStringChar( aSuperscriptFigures[2] ) ).append( " = " ); double fR( xRegressionCurveCalculator->getCorrelationCoefficient()); if (m_apNumberFormatterWrapper) { -- cgit