summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorBenjamin Ni <benjaminniri@hotmail.com>2015-09-25 11:41:53 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-02 23:40:57 +0100
commitbe729e772196f33543e21cb9bac21add87726b20 (patch)
treef2150f458e2b07f8924b4702d37c09c8dd52215a /chart2
parent6ccf68622e51c1b727dd042c1c1a71b5d1fd6a12 (diff)
tdf#94269: Replace "n" prefix for bool variables with "b"
Change-Id: I178545792c7354a362658ac7ef8b1d4cf0865797 Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2export.cxx20
-rw-r--r--chart2/qa/extras/chart2import.cxx6
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx8
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx8
4 files changed, 21 insertions, 21 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 1becdffc0d72..819d2556a58b 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -285,11 +285,11 @@ void checkCommonTrendline(
CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateBackward") >>= aExtrapolateBackward);
CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateBackward, aExtrapolateBackward);
- bool aForceIntercept = false;
- CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>= aForceIntercept);
- CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, aForceIntercept);
+ bool bForceIntercept = false;
+ CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>= bForceIntercept);
+ CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, bForceIntercept);
- if (aForceIntercept)
+ if (bForceIntercept)
{
double aInterceptValue = 0.0;
CPPUNIT_ASSERT(xProperties->getPropertyValue("InterceptValue") >>= aInterceptValue);
@@ -299,13 +299,13 @@ void checkCommonTrendline(
Reference< XPropertySet > xEquationProperties( xCurve->getEquationProperties() );
CPPUNIT_ASSERT(xEquationProperties.is());
- bool aShowEquation = false;
- CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>= aShowEquation);
- CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, aShowEquation);
+ bool bShowEquation = false;
+ CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>= bShowEquation);
+ CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, bShowEquation);
- bool aShowCorrelationCoefficient = false;
- CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= aShowCorrelationCoefficient);
- CPPUNIT_ASSERT_EQUAL(aExpectedR2, aShowCorrelationCoefficient);
+ bool bShowCorrelationCoefficient = false;
+ CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= bShowCorrelationCoefficient);
+ CPPUNIT_ASSERT_EQUAL(aExpectedR2, bShowCorrelationCoefficient);
}
void checkNameAndType(Reference<XPropertySet> xProperties, const OUString& aExpectedName, const OUString& aExpectedServiceName)
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 593f3c82969b..6847aeb50bb9 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -770,7 +770,7 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
load("/chart2/qa/extras/data/xlsx/", "chart-text-can-overlap.xlsx");
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
- bool textCanOverlap = false;
+ bool bTextCanOverlap = false;
uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc.is());
mxDiagram.set(xChartDoc->getDiagram());
@@ -778,9 +778,9 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY );
CPPUNIT_ASSERT(xAxisXSupp.is());
xAxisProp = xAxisXSupp->getXAxis();
- xAxisProp->getPropertyValue("TextCanOverlap") >>= textCanOverlap;
+ xAxisProp->getPropertyValue("TextCanOverlap") >>= bTextCanOverlap;
// Expected value of 'TextCanOverlap' is true
- CPPUNIT_ASSERT(textCanOverlap);
+ CPPUNIT_ASSERT(bTextCanOverlap);
}
*/
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index cab2df17b2f3..1f18f1fa1758 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -564,18 +564,18 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
sal_Int32 aDegree = 2;
sal_Int32 aPeriod = 2;
- bool aForceIntercept = false;
+ bool bForceIntercept = false;
double aInterceptValue = 0.0;
uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY );
if ( xProperties.is())
{
xProperties->getPropertyValue( "PolynomialDegree") >>= aDegree;
xProperties->getPropertyValue( "MovingAveragePeriod") >>= aPeriod;
- xProperties->getPropertyValue( "ForceIntercept") >>= aForceIntercept;
- if (aForceIntercept)
+ xProperties->getPropertyValue( "ForceIntercept") >>= bForceIntercept;
+ if (bForceIntercept)
xProperties->getPropertyValue( "InterceptValue") >>= aInterceptValue;
}
- xCalculator->setRegressionProperties(aDegree, aForceIntercept, aInterceptValue, 2);
+ xCalculator->setRegressionProperties(aDegree, bForceIntercept, aInterceptValue, 2);
RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel );
// change text for Moving Average
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index f7fae644125a..6add0fae65ee 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1090,7 +1090,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
sal_Int32 aPeriod = 2;
double aExtrapolateForward = 0.0;
double aExtrapolateBackward = 0.0;
- bool aForceIntercept = false;
+ bool bForceIntercept = false;
double aInterceptValue = 0.0;
if ( xProperties.is() && !bAverageLine )
@@ -1099,8 +1099,8 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
xProperties->getPropertyValue( "MovingAveragePeriod") >>= aPeriod;
xProperties->getPropertyValue( "ExtrapolateForward") >>= aExtrapolateForward;
xProperties->getPropertyValue( "ExtrapolateBackward") >>= aExtrapolateBackward;
- xProperties->getPropertyValue( "ForceIntercept") >>= aForceIntercept;
- if (aForceIntercept)
+ xProperties->getPropertyValue( "ForceIntercept") >>= bForceIntercept;
+ if (bForceIntercept)
xProperties->getPropertyValue( "InterceptValue") >>= aInterceptValue;
}
@@ -1121,7 +1121,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries& rVDataSeries,
fPointScale = (fMaxX - fMinX) / (fChartMaxX - fChartMinX);
}
- xCalculator->setRegressionProperties(aDegree, aForceIntercept, aInterceptValue, aPeriod);
+ xCalculator->setRegressionProperties(aDegree, bForceIntercept, aInterceptValue, aPeriod);
xCalculator->recalculateRegression( rVDataSeries.getAllX(), rVDataSeries.getAllY() );
sal_Int32 nPointCount = 100 * fPointScale;