diff options
| author | nadith <nadmalinda@gmail.com> | 2016-07-29 12:22:18 +0530 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-01 06:12:30 +0000 |
| commit | efef273e2c61b19a63572a71b103e3b1490f15af (patch) | |
| tree | 1d441e00b15eabd50820cae5e300cc8a6b6bb765 /chart2 | |
| parent | dadb28a2fbe3e50361b60cee9dda43b1fba3629e (diff) | |
tdf#100726: Improve readability of OUString concatenation
this bug fixed in the modules between canvas - cppu
Change-Id: I2022b022897dafde20251352376e3facdb9b8d75
Reviewed-on: https://gerrit.libreoffice.org/27663
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/ObjectNameProvider.cxx | 29 | ||||
| -rw-r--r-- | chart2/source/tools/ObjectIdentifier.cxx | 3 | ||||
| -rw-r--r-- | chart2/workbench/addin/sampleaddin.cxx | 4 |
3 files changed, 11 insertions, 25 deletions
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index a70894b392be..3eccea94c068 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -489,11 +489,9 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe { OUString aNewLine( "\n" ); - aRet=SCH_RESSTR(STR_TIP_DATAPOINT_INDEX); - aRet+=aNewLine; - aRet+=SCH_RESSTR(STR_TIP_DATASERIES); - aRet+=aNewLine; - aRet+=SCH_RESSTR(STR_TIP_DATAPOINT_VALUES); + aRet= SCH_RESSTR(STR_TIP_DATAPOINT_INDEX) + aNewLine + + SCH_RESSTR(STR_TIP_DATASERIES) + aNewLine + + SCH_RESSTR(STR_TIP_DATAPOINT_VALUES); } else aRet=SCH_RESSTR(STR_TIP_DATAPOINT); @@ -637,9 +635,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe Reference< chart2::XRegressionCurve > xCurve( RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) ); if( xCurve.is()) { - aRet += " ("; - aRet += RegressionCurveHelper::getRegressionCurveName(xCurve); - aRet += " )"; + aRet += " (" + RegressionCurveHelper::getRegressionCurveName(xCurve) + " )"; } } } @@ -790,19 +786,15 @@ OUString ObjectNameProvider::getNameForCID( case OBJECTTYPE_DATA_CURVE: case OBJECTTYPE_DATA_CURVE_EQUATION: { - OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ); - aRet += " "; + OUString aRet = lcl_getFullSeriesName( rObjectCID, xModel ) + " "; if( eType == OBJECTTYPE_DATA_POINT || eType == OBJECTTYPE_DATA_LABEL ) { aRet += getName( OBJECTTYPE_DATA_POINT ); sal_Int32 nPointIndex = ObjectIdentifier::getIndexFromParticleOrCID( rObjectCID ); - aRet += " "; - aRet += OUString::number(nPointIndex+1); - + aRet += " " + OUString::number(nPointIndex+1); if( eType == OBJECTTYPE_DATA_LABEL ) { - aRet += " "; - aRet += getName( OBJECTTYPE_DATA_LABEL ); + aRet += " " + getName( OBJECTTYPE_DATA_LABEL ); } } else if (eType == OBJECTTYPE_DATA_CURVE || eType == OBJECTTYPE_DATA_CURVE_EQUATION) @@ -810,8 +802,7 @@ OUString ObjectNameProvider::getNameForCID( Reference< chart2::XDataSeries > xSeries( ObjectIdentifier::getDataSeriesForCID( rObjectCID , xModel )); Reference< chart2::XRegressionCurveContainer > xCurveCnt( xSeries, uno::UNO_QUERY ); - aRet += " "; - aRet += getName(eType); + aRet += " " + getName(eType); if( xCurveCnt.is()) { @@ -819,9 +810,7 @@ OUString ObjectNameProvider::getNameForCID( Reference< chart2::XRegressionCurve > xCurve( RegressionCurveHelper::getRegressionCurveAtIndex(xCurveCnt, nCurveIndex) ); if( xCurve.is()) { - aRet += " ("; - aRet += RegressionCurveHelper::getRegressionCurveName(xCurve); - aRet += ")"; + aRet += " (" + RegressionCurveHelper::getRegressionCurveName(xCurve) + ")"; } } } diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 23db4eadd16d..94862b2cad22 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -1169,8 +1169,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType , const OUString& rDragMethodServiceName , const OUString& rDragParameterString ) { - OUString aChildParticle( getStringForType( eSubObjectType ) ); - aChildParticle+=("="); + OUString aChildParticle = getStringForType( eSubObjectType ) + ("="); return createClassifiedIdentifierForParticles( rSeriesParticle, aChildParticle diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index d2cce93008f9..a136747f9068 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -41,9 +41,7 @@ sal_Bool SAL_CALL component_writeInfo( { try { - OUString aImpl( "/" ); - aImpl += SampleAddIn::getImplementationName_Static(); - aImpl += "/UNO/SERVICES"; + OUString aImpl = "/" + SampleAddIn::getImplementationName_Static() + "/UNO/SERVICES"; uno::Reference< registry::XRegistryKey> xNewKey( reinterpret_cast<registry::XRegistryKey*>( pRegistryKey )->createKey( aImpl ) ); |