summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-07-30 17:58:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-07-31 13:00:34 +0200
commit2d447ddc7a46cb6eb475238df1e0b9d10f1e9c06 (patch)
treeb61368365af005d9570ccde39d49620997612e6b /chart2/source/tools
parent8b6c64513d6e3e2161f06c38fc093e47216dabb1 (diff)
Improved loplugin:stringconstant (now that GCC 7 supports it): chart2
Change-Id: I9fb8e2853b5ddb1f9fe589f4e47828025ea52915 Reviewed-on: https://gerrit.libreoffice.org/76692 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx2
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx2
-rw-r--r--chart2/source/tools/DataSource.cxx2
-rw-r--r--chart2/source/tools/ErrorBar.cxx2
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx8
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx2
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx2
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx14
-rw-r--r--chart2/source/tools/RegressionEquation.cxx2
-rw-r--r--chart2/source/tools/Scaling.cxx16
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx2
13 files changed, 29 insertions, 29 deletions
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 78641ccb9011..95777aa0e560 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -245,7 +245,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet
OUString SAL_CALL CachedDataSequence::getImplementationName()
{
- return OUString(lcl_aServiceName);
+ return lcl_aServiceName;
}
sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index c833a311c056..1618733aa15c 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -165,7 +165,7 @@ void ConfigColorScheme::notify( const OUString & rPropertyName )
OUString SAL_CALL ConfigColorScheme::getImplementationName()
{
- return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ;
+ return "com.sun.star.comp.chart2.ConfigDefaultColorScheme" ;
}
sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 9161a5ae2e4f..284427cd358f 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -56,7 +56,7 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab
OUString SAL_CALL DataSource::getImplementationName()
{
- return OUString("com.sun.star.comp.chart.DataSource");
+ return "com.sun.star.comp.chart.DataSource";
}
sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index f03887dc25d1..d605c7b07c8e 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -455,7 +455,7 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL E
OUString SAL_CALL ErrorBar::getImplementationName()
{
- return OUString(lcl_aServiceName);
+ return lcl_aServiceName;
}
sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index c520760fa557..acce76d5ea19 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1230,7 +1230,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
if( !aRange.aLowerRight.bIsEmpty &&
( aRange.aUpperLeft.nColumn != aRange.aLowerRight.nColumn ) &&
( aRange.aUpperLeft.nRow != aRange.aLowerRight.nRow ) )
- return OUString(lcl_aCompleteRange);
+ return lcl_aCompleteRange;
// attention: this data provider has the limitation that it stores
// internally if data comes from columns or rows. It is intended for
@@ -1241,7 +1241,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
if( m_bDataInColumns )
{
if( aRange.aUpperLeft.nColumn == 0 )
- return OUString(lcl_aCategoriesRangeName);
+ return lcl_aCategoriesRangeName;
if( aRange.aUpperLeft.nRow == 0 )
return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nColumn - 1 );
@@ -1250,7 +1250,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM
// data in rows
if( aRange.aUpperLeft.nRow == 0 )
- return OUString(lcl_aCategoriesRangeName);
+ return lcl_aCategoriesRangeName;
if( aRange.aUpperLeft.nColumn == 0 )
return lcl_aLabelRangePrefix + OUString::number( aRange.aUpperLeft.nRow - 1 );
@@ -1498,7 +1498,7 @@ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone()
OUString SAL_CALL InternalDataProvider::getImplementationName()
{
// note: in xmloff this name is used to indicate usage of own data
- return OUString("com.sun.star.comp.chart.InternalDataProvider");
+ return "com.sun.star.comp.chart.InternalDataProvider";
}
sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 7c9944b283f3..bd945715db12 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -146,7 +146,7 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::
OUString SAL_CALL LabeledDataSequence::getImplementationName()
{
- return OUString("com.sun.star.comp.chart2.LabeledDataSequence");
+ return "com.sun.star.comp.chart2.LabeledDataSequence";
}
sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 43088acc364a..5d98e8c563c1 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -118,7 +118,7 @@ OUString MeanValueRegressionCurveCalculator::ImplGetRepresentation(
{
*pFormulaLength -= aBuf.getLength();
if ( *pFormulaLength <= 0 )
- return OUString("###");
+ return "###";
}
return ( aBuf + getFormattedString( xNumFormatter, nNumberFormatKey, m_fMeanValue, pFormulaLength ) );
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index cfd7bb4cedec..0346b9be91f8 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -504,7 +504,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
OUString ObjectIdentifier::createParticleForDiagram()
{
//TODO: if more than one diagram is implemented, add the correct diagram index here
- return OUString("D=0");
+ return "D=0";
}
OUString ObjectIdentifier::createParticleForCoordinateSystem(
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index f3570114551e..cd6fd9d182be 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -86,7 +86,7 @@ OUString RegressionCurveCalculator::getFormattedString(
double fNumber, const sal_Int32* pStringLength /* = nullptr */ )
{
if ( pStringLength && *pStringLength <= 0 )
- return OUString("###");
+ return "###";
OUString aResult;
if( xNumFormatter.is() )
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 618c924dd41b..6afde52ea193 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -226,19 +226,19 @@ OUString SAL_CALL RegressionCurveModel::getServiceName()
switch( m_eRegressionCurveType )
{
case CURVE_TYPE_MEAN_VALUE:
- return OUString("com.sun.star.chart2.MeanValueRegressionCurve");
+ return "com.sun.star.chart2.MeanValueRegressionCurve";
case CURVE_TYPE_LINEAR:
- return OUString("com.sun.star.chart2.LinearRegressionCurve");
+ return "com.sun.star.chart2.LinearRegressionCurve";
case CURVE_TYPE_LOGARITHM:
- return OUString("com.sun.star.chart2.LogarithmicRegressionCurve");
+ return "com.sun.star.chart2.LogarithmicRegressionCurve";
case CURVE_TYPE_EXPONENTIAL:
- return OUString("com.sun.star.chart2.ExponentialRegressionCurve");
+ return "com.sun.star.chart2.ExponentialRegressionCurve";
case CURVE_TYPE_POWER:
- return OUString("com.sun.star.chart2.PotentialRegressionCurve");
+ return "com.sun.star.chart2.PotentialRegressionCurve";
case CURVE_TYPE_POLYNOMIAL:
- return OUString("com.sun.star.chart2.PolynomialRegressionCurve");
+ return "com.sun.star.chart2.PolynomialRegressionCurve";
case CURVE_TYPE_MOVING_AVERAGE:
- return OUString("com.sun.star.chart2.MovingAverageRegressionCurve");
+ return "com.sun.star.chart2.MovingAverageRegressionCurve";
}
return OUString();
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 5212c8d842d8..72da779cca35 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -303,7 +303,7 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
OUString SAL_CALL RegressionEquation::getImplementationName()
{
- return OUString("com.sun.star.comp.chart2.RegressionEquation");
+ return "com.sun.star.comp.chart2.RegressionEquation";
}
sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 492f845e932f..ef2e363c9737 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -72,12 +72,12 @@ uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling()
OUString SAL_CALL LogarithmicScaling::getServiceName()
{
- return OUString(lcl_aServiceName_Logarithmic);
+ return lcl_aServiceName_Logarithmic;
}
OUString SAL_CALL LogarithmicScaling::getImplementationName()
{
- return OUString(lcl_aServiceName_Logarithmic);
+ return lcl_aServiceName_Logarithmic;
}
sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName )
@@ -121,12 +121,12 @@ uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling()
OUString SAL_CALL ExponentialScaling::getServiceName()
{
- return OUString(lcl_aServiceName_Exponential);
+ return lcl_aServiceName_Exponential;
}
OUString SAL_CALL ExponentialScaling::getImplementationName()
{
- return OUString(lcl_aServiceName_Exponential);
+ return lcl_aServiceName_Exponential;
}
sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName )
@@ -174,12 +174,12 @@ uno::Reference< XScaling > SAL_CALL
OUString SAL_CALL LinearScaling::getServiceName()
{
- return OUString(lcl_aServiceName_Linear);
+ return lcl_aServiceName_Linear;
}
OUString SAL_CALL LinearScaling::getImplementationName()
{
- return OUString(lcl_aServiceName_Linear) ;
+ return lcl_aServiceName_Linear ;
}
sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName )
@@ -226,12 +226,12 @@ uno::Reference< XScaling > SAL_CALL
OUString SAL_CALL
PowerScaling::getServiceName()
{
- return OUString(lcl_aServiceName_Power);
+ return lcl_aServiceName_Power;
}
OUString SAL_CALL PowerScaling::getImplementationName()
{
- return OUString(lcl_aServiceName_Power);
+ return lcl_aServiceName_Power;
}
sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index ca3a9280c452..59fc826d3629 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -147,7 +147,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS
OUString SAL_CALL UncachedDataSequence::getImplementationName()
{
- return OUString(lcl_aServiceName);
+ return lcl_aServiceName;
}
sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName )