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 /forms | |
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 'forms')
-rw-r--r-- | forms/source/component/ListBox.cxx | 3 | ||||
-rw-r--r-- | forms/source/solar/control/navtoolbar.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index a14d6367d3ca..7c51f7c7a1b4 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -817,8 +817,7 @@ namespace frm aStatement += quoteName(aQuote,aFieldName); if (!aBoundFieldName.isEmpty()) { - aStatement += ", "; - aStatement += quoteName(aQuote, aBoundFieldName); + aStatement += ", " + quoteName(aQuote, aBoundFieldName); } aStatement += " FROM "; diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index a512c54a0793..f72cc3193dfd 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -57,8 +57,7 @@ namespace frm OUString getLabelString(const char* pResId) { - OUString sLabel( " " + FRM_RES_STRING(pResId) ); - sLabel += " "; + OUString sLabel( " " + FRM_RES_STRING(pResId) + " " ); return sLabel; } |