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>

2 files changed, 13 insertions, 13 deletions

diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index abb929be4230..eb01a00c5291 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -52,7 +52,7 @@
 #include <sal/log.hxx>
 #include <rtl/ustrbuf.hxx>
 
-#define PRESET_DEFAULT "default"
+#define PRESET_DEFAULT u"default"
 #define TARGET_CURRENT "current"
 
 namespace framework
@@ -217,7 +217,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
     css::uno::Reference< css::io::XStream > xStreamNoLang;
     {
         SolarMutexGuard g;
-        xStream = m_aPresetHandler.openTarget(TARGET_CURRENT,
+        xStream = m_aPresetHandler.openTarget(u"" TARGET_CURRENT,
                 css::embed::ElementModes::READ);
         try
         {
@@ -257,7 +257,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
     css::uno::Reference< css::io::XStream > xStream;
     {
         SolarMutexGuard g;
-        xStream = m_aPresetHandler.openTarget(TARGET_CURRENT,
+        xStream = m_aPresetHandler.openTarget(u"" TARGET_CURRENT,
                css::embed::ElementModes::READWRITE); // open or create!
     }
 
@@ -308,7 +308,7 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
     css::uno::Reference< css::io::XStream > xStream;
     {
         SolarMutexGuard g;
-        xStream = m_aPresetHandler.openTarget(TARGET_CURRENT,
+        xStream = m_aPresetHandler.openTarget(u"" TARGET_CURRENT,
                 css::embed::ElementModes::READWRITE); // open or create!
     }
 
@@ -343,7 +343,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reset()
 {
     {
         SolarMutexGuard g;
-        m_aPresetHandler.copyPresetToTarget(PRESET_DEFAULT, TARGET_CURRENT);
+        m_aPresetHandler.copyPresetToTarget(PRESET_DEFAULT, u"" TARGET_CURRENT);
     }
 
     reload();
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 491f48a35c96..bce2e3861499 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -449,8 +449,8 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     }
 }
 
-void PresetHandler::copyPresetToTarget(const OUString& sPreset,
-                                       const OUString& sTarget)
+void PresetHandler::copyPresetToTarget(std::u16string_view sPreset,
+                                       std::u16string_view sTarget)
 {
     // don't check our preset list, if element exists
     // We try to open it and forward all errors to the user!
@@ -474,8 +474,8 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
        return;
     }
 
-    OUString sPresetFile = sPreset + ".xml";
-    OUString sTargetFile = sTarget + ".xml";
+    OUString sPresetFile = OUString::Concat(sPreset) + ".xml";
+    OUString sTargetFile = OUString::Concat(sTarget) + ".xml";
 
     // remove existing elements before you try to copy the preset to that location ...
     // Otherwise w will get an ElementExistException inside copyElementTo()!
@@ -490,7 +490,7 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
     commitUserChanges();
 }
 
-css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset)
+css::uno::Reference< css::io::XStream > PresetHandler::openPreset(std::u16string_view sPreset)
 {
     css::uno::Reference< css::embed::XStorage > xFolder;
     {
@@ -502,7 +502,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString
     if (!xFolder.is())
        return css::uno::Reference< css::io::XStream >();
 
-    OUString sFile = sPreset + ".xml";
+    OUString sFile = OUString::Concat(sPreset) + ".xml";
 
     // inform user about errors (use original exceptions!)
     css::uno::Reference< css::io::XStream > xStream = xFolder->openStreamElement(sFile, css::embed::ElementModes::READ);
@@ -510,7 +510,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString
 }
 
 css::uno::Reference< css::io::XStream > PresetHandler::openTarget(
-        const OUString& sTarget, sal_Int32 const nMode)
+        std::u16string_view sTarget, sal_Int32 const nMode)
 {
     css::uno::Reference< css::embed::XStorage > xFolder;
     {
@@ -522,7 +522,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(
     if (!xFolder.is())
        return css::uno::Reference< css::io::XStream >();
 
-    OUString const sFile(sTarget + ".xml");
+    OUString const sFile(OUString::Concat(sTarget) + ".xml");
 
     return xFolder->openStreamElement(sFile, nMode);
 }