3 files changed, 7 insertions, 4 deletions
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index c0dc02c243ad..b93b43b64e78 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -199,7 +199,8 @@ static void LogProbe(
 {
     OString sTemp;
     if ( pMemberType && pMemberType->pTypeName )
-        sTemp = OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US);
+        sTemp = OUStringToOString(
+            OUString::unacquired(&pMemberType->pTypeName),RTL_TEXTENCODING_ASCII_US);
     if ( pre  )
     {
         SAL_INFO("cppu.log", "{ LogBridge () " << sTemp );
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 5d0d0b84f573..21f84241f578 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -279,7 +279,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
             typelib_TypeDescriptionReference * pTDR = rEntry.second;
             if (pTDR)
             {
-                OString aTypeName( OUStringToOString( pTDR->pTypeName, RTL_TEXTENCODING_ASCII_US ) );
+                OString aTypeName( OUStringToOString( OUString::unacquired(&pTDR->pTypeName), RTL_TEXTENCODING_ASCII_US ) );
                 SAL_INFO("cppu.typelib", "remaining type: " << aTypeName << "; ref count = " << pTDR->nRefCount);
             }
             else
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 3a86f9882b7f..93a6a1bb588f 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -41,6 +41,7 @@
 #include "prim.hxx"
 #include "loadmodule.hxx"
 
+#include <string_view>
 #include <unordered_map>
 #include <vector>
 #include <stdio.h>
@@ -672,7 +673,7 @@ void writeLine(
 
 
 void writeLine(
-    void * stream, const OUString & rLine, const char * pFilter )
+    void * stream, std::u16string_view rLine, const char * pFilter )
 {
     OString aLine( OUStringToOString(
                               rLine, RTL_TEXTENCODING_ASCII_US ) );
@@ -777,7 +778,8 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName(
     else
     {
         writeLine(
-            stream, "environment \"" + OUString::unacquired(&pEnvDcp) + "\" does not exist!",
+            stream,
+            OUString("environment \"" + OUString::unacquired(&pEnvDcp) + "\" does not exist!"),
             pFilter );
     }
 }