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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/source/office/breadcrumb.cxx | 3 | ||||
| -rw-r--r-- | fpicker/source/office/fileview.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fpicker/source/office/breadcrumb.cxx b/fpicker/source/office/breadcrumb.cxx index 76bc0f1d17d3..a300a32cc1d0 100644 --- a/fpicker/source/office/breadcrumb.cxx +++ b/fpicker/source/office/breadcrumb.cxx @@ -75,8 +75,7 @@ void Breadcrumb::SetURL( const OUString& rURL ) if( aURL.HasPort() ) { - sHostPort += ":"; - sHostPort += OUString::number( aURL.GetPort() ); + sHostPort += ":" + OUString::number( aURL.GetPort() ); } OUString sUser = aURL.GetUser( INetURLObject::DecodeMechanism::NONE ); diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 4d14086e0e8b..127a8800be52 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -1055,8 +1055,7 @@ OUString SvtFileView::GetConfigString() const OUString sRet = OUString::number( mpImpl->mnSortColumn ) + ";"; bool bUp = mpImpl->mbAscending; - sRet += bUp ? OUString("1") : OUString("0"); - sRet += ";"; + sRet += (bUp ? OUString("1") : OUString("0")) + ";"; weld::TreeView* pView = mpImpl->mxView->getWidget(); sal_uInt16 nCount = mpImpl->mxView->TypeColumnVisible() ? 4 : 3; |