diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-30 20:27:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-31 09:14:39 +0100 |
| commit | d526bd7dd5b94be6fe5a823372da1facca3d43fa (patch) | |
| tree | 656b49726096326e7832cde5c177f85fd8c8c454 /chart2 | |
| parent | 7eeb484e7d1faf87fbb8774a8bda4328d047dde3 (diff) | |
Fix StringAdd::isCompileTimeConstant
...to find StringLiteral on the RHS of +=. Which revealed that the
VisitCompoundStmt/checkForCompoundAssign logic needed to be fixed, too, so that
s += side_effect();
s += "literal";
s += side_effect();
only gets combined to
s += side_effect() + "literal";
s += side_effect();
and not all the way to
s += side_effect() + "literal" + side_effect();
Change-Id: I432e3458b933a7d0ad6141c747b675cc8b0f0ba4
Reviewed-on: https://gerrit.libreoffice.org/81804
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ObjectHierarchy.cxx | 3 | ||||
| -rw-r--r-- | chart2/source/view/main/VDataSeries.cxx | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 2fa0e64c31c8..429d9ad7e272 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -436,8 +436,7 @@ void ImplObjectHierarchy::createDataSeriesTree( // data labels if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { - OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle += "="; + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ); } diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a446cd79d538..0f2749a1f6c7 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -358,16 +358,15 @@ void VDataSeries::setParticle( const OUString& rSeriesParticle ) OUString VDataSeries::getErrorBarsCID(bool bYError) const { OUString aChildParticle( ObjectIdentifier::getStringForType( - bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) ); - aChildParticle += "="; + bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) + + "=" ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } OUString VDataSeries::getLabelsCID() const { - OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle += "="; + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); |