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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 4 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 3 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index fc7847dbfd06..0cad7f935107 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2489,9 +2489,7 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf ) aAttr = OUString::number( aSize.Height() ) + "mm"; AddAttribute( XML_NAMESPACE_NONE, "height", aAttr ); - aAttr = "0 0 "; - aAttr += OUString::number( aSize.Width() * 100L ); - aAttr += " "; + aAttr = "0 0 " + OUString::number( aSize.Width() * 100L ) + " "; aAttr += OUString::number( aSize.Height() * 100L ); AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 2f3c31fcb8bc..9253bbace5f3 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1171,8 +1171,7 @@ bool SVGTextWriter::nextTextPortion() if( ( xTextFieldPropSet->getPropertyValue( sFieldName ) ) >>= sURL ) { #if OSL_DEBUG_LEVEL > 0 - sInfo += "url: "; - sInfo += mrExport.GetRelativeReference( sURL ); + sInfo += "url: " + mrExport.GetRelativeReference( sURL ); #endif msUrl = mrExport.GetRelativeReference( sURL ); if( !msUrl.isEmpty() ) diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 24e3c927fa3b..c0352343adb6 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -361,8 +361,7 @@ void XMLFilterTestDialog::onExportBrowse() { if( n > 0 ) aExtension += ";"; - aExtension += "*."; - aExtension += *pExtensions++; + aExtension += "*." + *pExtensions++; } } } |