From ab285c743afa1c8769581871d7b56374fd8c49f1 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Sat, 2 Nov 2019 18:59:49 +0200
Subject: loplugin:stringadd

tweak the plugin to be more permissive, then validate by hand
afterwards

Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654
Reviewed-on: https://gerrit.libreoffice.org/81942
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sw/source/uibase/utlui/content.cxx | 10 +++++-----
 sw/source/uibase/utlui/navipi.cxx  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sw/source/uibase/utlui')

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 47a6852df369..21b72b3a9bcd 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1263,8 +1263,8 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
     pSubPop3->InsertItem(nId++, m_aContextStrings[IDX_STR_ACTIVE_VIEW], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
     if(m_pHiddenShell)
     {
-        OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle();
-        sHiddenEntry += " ( " +
+        OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle() +
+            " ( " +
             m_aContextStrings[IDX_STR_HIDDEN] +
             " )";
         pSubPop3->InsertItem(nId, sHiddenEntry, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
@@ -3202,10 +3202,10 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
             else
             {
                 const size_t nMemberCount = static_cast<SwContentType*>(pUserData)->GetMemberCount();
-                sEntry = OUString::number(nMemberCount) + " ";
-                sEntry += nMemberCount == 1
+                sEntry = OUString::number(nMemberCount) + " " +
+                    (nMemberCount == 1
                             ? static_cast<SwContentType*>(pUserData)->GetSingleName()
-                            : static_cast<SwContentType*>(pUserData)->GetName();
+                            : static_cast<SwContentType*>(pUserData)->GetName());
                 bRet = true;
             }
             if(bRet)
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index f6155e16d80f..e016ab69910f 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -989,8 +989,8 @@ void SwNavigationPI::UpdateListBox()
     if(m_aContentTree->GetHiddenWrtShell())
     {
         OUString sEntry = m_aContentTree->GetHiddenWrtShell()->GetView().
-                                        GetDocShell()->GetTitle();
-        sEntry += " (" +
+                                        GetDocShell()->GetTitle() +
+            " (" +
             m_aStatusArr[IDX_STR_HIDDEN] +
             ")";
         m_aDocListBox->InsertEntry(sEntry);
-- 
cgit v1.2.3