[Libreoffice-commits] core.git: sfx2/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 24 21:10:45 UTC 2019


 sfx2/source/appl/shutdownicon.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit c698cb4f2d7ad100b25e15558a7aef2314b44a99
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 24 17:55:03 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 24 23:09:11 2019 +0200

    Manually clean up some string concatenation
    
    (that loplugin:stringadd didn't flag because of its conservative
    isSideEffectFree check)
    
    Change-Id: I109b1680a14540d8438eee82b45518e07611fdcd
    Reviewed-on: https://gerrit.libreoffice.org/81464
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index c0153cb12c8f..727c06d1e1bf 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -619,11 +619,7 @@ bool ShutdownIcon::IsQuickstarterInstalled()
 #ifdef _WIN32
 OUString ShutdownIcon::getShortcutName()
 {
-    OUString aShortcutName(SfxResId(STR_QUICKSTART_LNKNAME) + ".lnk");
-
-    OUString aShortcut(GetAutostartFolderNameW32());
-    aShortcut += "\\" + aShortcutName;
-    return aShortcut;
+    return GetAutostartFolderNameW32() + "\\" + SfxResId(STR_QUICKSTART_LNKNAME) + ".lnk";
 }
 #endif // _WIN32
 #endif


More information about the Libreoffice-commits mailing list