2 files changed, 4 insertions, 3 deletions
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index c41625522f32..c03d518108f3 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -37,6 +37,7 @@
 
 #include "iahndl.hxx"
 #include <memory>
+#include <string_view>
 
 using namespace com::sun::star;
 
@@ -55,14 +56,14 @@ DialogMask
 executeErrorDialog(
     weld::Window* pParent,
     task::InteractionClassification eClassification,
-    OUString const & rContext,
+    std::u16string_view rContext,
     std::u16string_view rMessage,
     MessageBoxStyle nButtonMask)
 {
     SolarMutexGuard aGuard;
 
     OUStringBuffer aText(rContext);
-    if (!rContext.isEmpty() && !rMessage.empty())
+    if (!rContext.empty() && !rMessage.empty())
         aText.append(":\n");
             //TODO! must be internationalized
     aText.append(rMessage);
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 79af305653ff..601796e656a5 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -179,7 +179,7 @@ void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage
 
     mpInfos = &rInfos;
     OUString aCN_Id("CN");
-    OUStringBuffer s = GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id );
+    OUStringBuffer s(GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id ));
 
     for( sal_Int32 i = 1 ; i < nCnt ; ++i )
     {