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

[Libreoffice Gerrit user]

 sd/source/ui/func/fudraw.cxx |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 426f91e9aec7650b25996a91862a99367cd7d49a
Author:     Matteo Casalin <matteo.casalin at yahoo.com>
AuthorDate: Sun Feb 10 16:58:47 2019 +0100
Commit:     Matteo Casalin <matteo.casalin at yahoo.com>
CommitDate: Sun Feb 17 17:53:51 2019 +0100

    Use optimized OUString concatenation
    
    Change-Id: I7093167a5a8ff70dcc1227bd878e70f60c22a288
    Reviewed-on: https://gerrit.libreoffice.org/67648
    Tested-by: Jenkins
    Reviewed-by: Matteo Casalin <matteo.casalin at yahoo.com>

diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 77a6a14010b7..272c0ceee90d 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -863,35 +863,34 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
             case presentation::ClickAction_BOOKMARK:
             {
                 // jump to object/page
-                aHelpText = SdResId(STR_CLICK_ACTION_BOOKMARK);
-                aHelpText += ": ";
-                aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
+                aHelpText = SdResId(STR_CLICK_ACTION_BOOKMARK)
+                    + ": "
+                    + INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
             }
             break;
 
             case presentation::ClickAction_DOCUMENT:
             {
                 // jump to document (object/page)
-                aHelpText = SdResId(STR_CLICK_ACTION_DOCUMENT);
-                aHelpText += ": ";
-                aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
+                aHelpText = SdResId(STR_CLICK_ACTION_DOCUMENT)
+                    + ": "
+                    + INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
             }
             break;
 
             case presentation::ClickAction_PROGRAM:
             {
                 // execute program
-                aHelpText = SdResId(STR_CLICK_ACTION_PROGRAM);
-                aHelpText += ": ";
-                aHelpText += INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
+                aHelpText = SdResId(STR_CLICK_ACTION_PROGRAM)
+                    + ": "
+                    + INetURLObject::decode( pInfo->GetBookmark(), INetURLObject::DecodeMechanism::WithCharset );
             }
             break;
 
             case presentation::ClickAction_MACRO:
             {
                 // execute program
-                aHelpText = SdResId(STR_CLICK_ACTION_MACRO);
-                aHelpText += ": ";
+                aHelpText = SdResId(STR_CLICK_ACTION_MACRO) + ": ";
 
                 if ( SfxApplication::IsXScriptURL( pInfo->GetBookmark() ) )
                 {
@@ -904,11 +903,7 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE
                     const OUString s0{ sBookmark.getToken( 0, '.', nIdx ) };
                     const OUString s1{ sBookmark.getToken( 0, '.', nIdx ) };
                     const OUString s2{ sBookmark.getToken( 0, '.', nIdx ) };
-                    aHelpText += s2;
-                    aHelpText += ".";
-                    aHelpText += s1;
-                    aHelpText += ".";
-                    aHelpText += s0;
+                    aHelpText += s2 + "." + s1 + "." + s0;
                 }
             }
             break;