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 /dbaccess/source | |
| 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 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/misc/singledoccontroller.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/querydlg.cxx | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 87b1ca9b2447..b4000c4ba8b1 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -104,8 +104,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetUndoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sUndo(DBA_RES(STR_UNDO_COLON)); - sUndo += " "; + OUString sUndo(DBA_RES(STR_UNDO_COLON) + " "); sUndo += GetUndoManager().GetUndoActionComment(); aReturn.sTitle = sUndo; } @@ -115,8 +114,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetRedoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sRedo(DBA_RES(STR_REDO_COLON)); - sRedo += " "; + OUString sRedo(DBA_RES(STR_REDO_COLON) + " "); sRedo += GetUndoManager().GetRedoActionComment(); aReturn.sTitle = sRedo; } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index abc203ce9c13..8c994510fd80 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -217,8 +217,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, weld::ComboBox&, void ) } if ( bAddHint ) { - sHelpText += "\n"; - sHelpText += DBA_RES( STR_JOIN_TYPE_HINT ); + sHelpText += "\n" + DBA_RES( STR_JOIN_TYPE_HINT ); } m_xML_HelpText->set_label( sHelpText ); |