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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4f68f9edac27..ef94b0d96da3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1395,9 +1395,7 @@ int Desktop::Main() #ifdef DBG_UTIL //include buildid in non product builds - aTitle += " ["; - aTitle += utl::Bootstrap::getBuildIdData("development"); - aTitle += "]"; + aTitle += " [" + utl::Bootstrap::getBuildIdData("development") + "]"; #endif SetDisplayName( aTitle ); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index eb29a69f5e09..3fe66f665ea1 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -314,8 +314,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 ); - destFolder = dp_misc::makeURL( sTempDir, tempEntry ); - destFolder += "_"; + destFolder = dp_misc::makeURL( sTempDir, tempEntry ) + "_"; m_sDownloadFolder = destFolder; try { @@ -565,8 +564,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update } tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 ); - destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ); - destFolder += "_"; + destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ) + "_"; ::ucbhelper::Content destFolderContent; dp_misc::create_folder( &destFolderContent, destFolder, m_updateCmdEnv.get() ); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a0db3f4daaca..ac814592daf8 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -622,8 +622,7 @@ OUString PackageManagerImpl::insertToActivationLayer( ::utl::TempFile aTemp(&baseDir, false); OUString tempEntry = aTemp.GetURL(); tempEntry = tempEntry.copy(tempEntry.lastIndexOf('/') + 1); - OUString destFolder = makeURL( m_activePackages, tempEntry); - destFolder += "_"; + OUString destFolder = makeURL( m_activePackages, tempEntry) + "_"; // prepare activation folder: ::ucbhelper::Content destFolderContent; |