From 042033f1e6da22616cb76c8d950c20c9efecbad5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 28 Dec 2020 17:56:40 +0100
Subject: loplugin:stringviewparam: operator +

Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 vcl/source/app/brand.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'vcl/source/app')

diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 2906061061ca..269d141de3fe 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <config_folders.h>
 
 #include <rtl/ustring.hxx>
@@ -41,9 +45,9 @@ namespace {
         else
             return false;
     }
-    bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap )
+    bool tryLoadPng( std::u16string_view rBaseDir, std::u16string_view rName, BitmapEx& rBitmap )
     {
-        return loadPng( rBaseDir + "/" LIBO_ETC_FOLDER + rName, rBitmap);
+        return loadPng( OUString::Concat(rBaseDir) + "/" LIBO_ETC_FOLDER + rName, rBitmap);
     }
 }
 
@@ -63,11 +67,11 @@ bool Application::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
     ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings( true));
     for (const OUString & aFallback : aFallbacks)
     {
-        if (tryLoadPng( aBaseDir, aBaseName + "-" + aFallback + aPng, rBitmap))
+        if (tryLoadPng( aBaseDir, OUString(aBaseName + "-" + aFallback + aPng), rBitmap))
             return true;
     }
 
-    return tryLoadPng( aBaseDir, aBaseName + aPng, rBitmap);
+    return tryLoadPng( aBaseDir, OUString(aBaseName + aPng), rBitmap);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit