use more string_view in INetURLObject

Change-Id: I4462f7cf4740fa4d1b129d76a0775f4250f41bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

20 files changed, 52 insertions, 53 deletions

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 6c839b21997b..e7ee08c4c193 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -211,7 +211,7 @@ public:
     static PrintFontManager& get(); // one instance only
 
     // There may be multiple font ids for font collections
-    std::vector<fontID> addFontFile( const OUString& rFileUrl );
+    std::vector<fontID> addFontFile( std::u16string_view rFileUrl );
 
     void initialize();
 
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 75c1e4cd0852..c55947c8bdb2 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -92,7 +92,7 @@ public:
                                             const OUString& rFileURL,
                                             const OUString& rFontName ) override;
     static bool             AddTempDevFontHelper( vcl::font::PhysicalFontCollection* pFontCollection,
-                                                  const OUString& rFileURL,
+                                                  std::u16string_view rFileURL,
                                                   const OUString& rFontName);
 
     virtual bool            CreateFontSubset( const OUString& rToFile,
diff --git a/vcl/qa/cppunit/GraphicDescriptorTest.cxx b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
index 865202cedbf5..ace1a6c90a28 100644
--- a/vcl/qa/cppunit/GraphicDescriptorTest.cxx
+++ b/vcl/qa/cppunit/GraphicDescriptorTest.cxx
@@ -61,7 +61,7 @@ void createBitmapAndExportForType(SvStream& rStream, std::u16string_view sType)
     uno::Sequence<beans::PropertyValue> aFilterData;
     GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nFilterFormat = rGraphicFilter.GetExportFormatNumberForShortName(sType);
-    rGraphicFilter.ExportGraphic(aBitmapEx, "none", rStream, nFilterFormat, &aFilterData);
+    rGraphicFilter.ExportGraphic(aBitmapEx, u"none", rStream, nFilterFormat, &aFilterData);
 
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
 }
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index 2e398c544c79..4bdd2854cae8 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -161,7 +161,7 @@ void createBitmapAndExportForType(SvStream& rStream, std::u16string_view sType,
     uno::Sequence<beans::PropertyValue> aFilterData;
     GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nFilterFormat = rGraphicFilter.GetExportFormatNumberForShortName(sType);
-    rGraphicFilter.ExportGraphic(aBitmapEx, "none", rStream, nFilterFormat, &aFilterData);
+    rGraphicFilter.ExportGraphic(aBitmapEx, u"none", rStream, nFilterFormat, &aFilterData);
 
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
 }
@@ -250,9 +250,8 @@ Graphic loadGraphic(std::u16string_view const& rFilename)
     GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
 
     Graphic aGraphic;
-    CPPUNIT_ASSERT_EQUAL(
-        ERRCODE_NONE,
-        rGraphicFilter.ImportGraphic(aGraphic, OUString(), aFileStream, GRFILTER_FORMAT_DONTKNOW));
+    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, rGraphicFilter.ImportGraphic(aGraphic, u"", aFileStream,
+                                                                    GRFILTER_FORMAT_DONTKNOW));
     return aGraphic;
 }
 
@@ -336,7 +335,7 @@ void GraphicTest::testUnloadedGraphicWmf()
     Graphic aGraphic(aBitmapEx);
     aGraphic.SetPrefSize(Size(99, 99));
     aGraphic.SetPrefMapMode(MapMode(MapUnit::Map100thMM));
-    rGraphicFilter.ExportGraphic(aGraphic, "none", aStream, nFilterFormat);
+    rGraphicFilter.ExportGraphic(aGraphic, u"none", aStream, nFilterFormat);
     aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
     // Now lazy-load this WMF data, with a custom preferred size of 42x42.
@@ -404,7 +403,7 @@ void GraphicTest::testWMFRoundtrip()
     aTempFile.EnableKillingFile();
     sal_uInt16 nFormat = rGraphicFilter.GetExportFormatNumberForShortName(u"WMF");
     SvStream& rOutStream = *aTempFile.GetStream(StreamMode::READWRITE);
-    rGraphicFilter.ExportGraphic(aGraphic, OUString(), rOutStream, nFormat);
+    rGraphicFilter.ExportGraphic(aGraphic, u"", rOutStream, nFormat);
 
     // Check if we preserved the WMF data perfectly.
     sal_uInt64 nActualSize = rOutStream.TellEnd();
@@ -470,7 +469,7 @@ void GraphicTest::testWMFWithEmfPlusRoundtrip()
         else
         {
             sal_uInt16 nFormat = rGraphicFilter.GetExportFormatNumberForShortName(u"WMF");
-            rGraphicFilter.ExportGraphic(aGraphic, OUString(), rOutStream, nFormat);
+            rGraphicFilter.ExportGraphic(aGraphic, u"", rOutStream, nFormat);
         }
         CPPUNIT_ASSERT_EQUAL(nExpectedSize, rOutStream.TellEnd());
 
@@ -502,14 +501,14 @@ void GraphicTest::testEmfToWmfConversion()
     // This similar to an application/x-openoffice-wmf mime type in manifest.xml in the ODF case.
     sal_uInt16 nFormat = aGraphicFilter.GetImportFormatNumberForShortName(u"WMF");
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE,
-                         aGraphicFilter.ImportGraphic(aGraphic, OUString(), aStream, nFormat));
+                         aGraphicFilter.ImportGraphic(aGraphic, u"", aStream, nFormat));
     CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Wmf, aGraphic.getVectorGraphicData()->getType());
 
     // Save as WMF.
     sal_uInt16 nFilterType = aGraphicFilter.GetExportFormatNumberForShortName(u"WMF");
     SvMemoryStream aGraphicStream;
-    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, aGraphicFilter.ExportGraphic(aGraphic, OUString(),
-                                                                    aGraphicStream, nFilterType));
+    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE,
+                         aGraphicFilter.ExportGraphic(aGraphic, u"", aGraphicStream, nFilterType));
     aGraphicStream.Seek(0);
     vcl::GraphicFormatDetector aDetector(aGraphicStream, OUString());
     CPPUNIT_ASSERT(aDetector.detect());
@@ -524,8 +523,8 @@ void GraphicTest::testEmfToWmfConversion()
     // Import the WMF result and check for traces of EMF+ in it.
     Graphic aWmfGraphic;
     aGraphicStream.Seek(0);
-    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, aGraphicFilter.ImportGraphic(aWmfGraphic, OUString(),
-                                                                    aGraphicStream, nFormat));
+    CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE,
+                         aGraphicFilter.ImportGraphic(aWmfGraphic, u"", aGraphicStream, nFormat));
     int nCommentCount = 0;
     for (size_t i = 0; i < aWmfGraphic.GetGDIMetaFile().GetActionSize(); ++i)
     {
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index f10de06fc837..e065cf6b5d09 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -119,14 +119,14 @@ void VclFiltersTest::checkExportImport(std::u16string_view aFilterShortName)
     };
 
     sal_uInt16 aFilterType = mpGraphicFilter->GetExportFormatNumberForShortName(aFilterShortName);
-    mpGraphicFilter->ExportGraphic(BitmapEx(aBitmap), OUString(), aStream, aFilterType, &aFilterData );
+    mpGraphicFilter->ExportGraphic(BitmapEx(aBitmap), u"", aStream, aFilterType, &aFilterData );
 
     CPPUNIT_ASSERT(aStream.Tell() > 0);
 
     aStream.Seek( STREAM_SEEK_TO_BEGIN );
 
     Graphic aLoadedGraphic;
-    mpGraphicFilter->ImportGraphic( aLoadedGraphic, OUString(), aStream );
+    mpGraphicFilter->ImportGraphic( aLoadedGraphic, u"", aStream );
 
     BitmapEx aLoadedBitmapEx = aLoadedGraphic.GetBitmapEx();
     Size aSize = aLoadedBitmapEx.GetSizePixel();
diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
index 77e412088bf3..72f12ca565f5 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx
@@ -193,11 +193,11 @@ void TiffFilterTest::testRoundtrip()
     SvMemoryStream aStream;
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName(u"tif");
-    rFilter.ExportGraphic(Graphic(BitmapEx(aBitmap)), "none", aStream, nFilterFormat);
+    rFilter.ExportGraphic(Graphic(BitmapEx(aBitmap)), u"none", aStream, nFilterFormat);
     aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
     Graphic aGraphic;
-    ErrCode bResult = rFilter.ImportGraphic(aGraphic, "none", aStream);
+    ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"none", aStream);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
     CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeTif, aGraphic.GetGfxLink().GetType());
     Bitmap aResultBitmap = aGraphic.GetBitmapEx().GetBitmap();
diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
index 90528199c0ba..f9d0bfa842dc 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx
@@ -111,11 +111,11 @@ void WebpFilterTest::testRoundtrip(bool lossy)
         comphelper::makePropertyValue("Lossless", !lossy),
         comphelper::makePropertyValue("Quality", sal_Int32(100))
     };
-    rFilter.ExportGraphic(Graphic(aBitmapEx), "none", aStream, nFilterFormat, &aFilterData);
+    rFilter.ExportGraphic(Graphic(aBitmapEx), u"none", aStream, nFilterFormat, &aFilterData);
     aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
     Graphic aGraphic;
-    ErrCode bResult = rFilter.ImportGraphic(aGraphic, "none", aStream);
+    ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"none", aStream);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
     CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeWebp, aGraphic.GetGfxLink().GetType());
     BitmapEx aResultBitmap = aGraphic.GetBitmapEx();
@@ -172,7 +172,7 @@ void WebpFilterTest::testRead(bool lossy, bool alpha)
     SvFileStream aFileStream(file, StreamMode::READ);
     Graphic aGraphic;
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
-    ErrCode bResult = rFilter.ImportGraphic(aGraphic, "none", aFileStream);
+    ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"none", aFileStream);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
     CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeWebp, aGraphic.GetGfxLink().GetType());
     BitmapEx aResultBitmap = aGraphic.GetBitmapEx();
diff --git a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
index f999c018df7c..f9b58c30843b 100644
--- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx
@@ -60,7 +60,7 @@ BitmapEx JpegWriterTest::roundtripJPG(const BitmapEx& bitmap)
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
     sal_uInt16 exportFormatJPG = rFilter.GetExportFormatNumberForShortName(JPG_SHORTNAME);
     Graphic aExportGraphic(bitmap);
-    ErrCode bResult = rFilter.ExportGraphic(aExportGraphic, "memory", aStream, exportFormatJPG);
+    ErrCode bResult = rFilter.ExportGraphic(aExportGraphic, u"memory", aStream, exportFormatJPG);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
     //Detect the magic bytes - we need to be sure the file is actually a JPEG
     aStream.Seek(0);
@@ -71,7 +71,7 @@ BitmapEx JpegWriterTest::roundtripJPG(const BitmapEx& bitmap)
     aStream.Seek(0);
     Graphic aImportGraphic;
     sal_uInt16 importFormatJPG = rFilter.GetImportFormatNumberForShortName(JPG_SHORTNAME);
-    bResult = rFilter.ImportGraphic(aImportGraphic, "memory", aStream, importFormatJPG);
+    bResult = rFilter.ImportGraphic(aImportGraphic, u"memory", aStream, importFormatJPG);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
     return aImportGraphic.GetBitmapEx();
 }
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 42d9e15668e3..0bfebea97464 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -1747,7 +1747,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf121615)
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
     Graphic aGraphic;
     sal_uInt16 format;
-    ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString("import"), rObjectStream,
+    ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"import", rObjectStream,
                                             GRFILTER_FORMAT_DONTKNOW, &format);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
 
@@ -1795,7 +1795,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf141171)
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
     Graphic aGraphic;
     sal_uInt16 format;
-    ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString("import"), rObjectStream,
+    ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"import", rObjectStream,
                                             GRFILTER_FORMAT_DONTKNOW, &format);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
 
@@ -1852,7 +1852,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf129085)
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
     Graphic aGraphic;
     sal_uInt16 format;
-    ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString("import"), rObjectStream,
+    ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"import", rObjectStream,
                                             GRFILTER_FORMAT_DONTKNOW, &format);
     CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult);
 
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index d7aee00c19ae..57db30d458e4 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -34,7 +34,7 @@
 #include <vcl/svapp.hxx>
 
 namespace {
-    bool loadPng( const OUString & rPath, BitmapEx &rBitmap)
+    bool loadPng( std::u16string_view rPath, BitmapEx &rBitmap)
     {
         INetURLObject aObj( rPath );
         SvFileStream aStrm( aObj.PathToFileName(), StreamMode::STD_READ );
@@ -48,7 +48,7 @@ namespace {
     }
     bool tryLoadPng( std::u16string_view rBaseDir, std::u16string_view rName, BitmapEx& rBitmap )
     {
-        return loadPng( OUString::Concat(rBaseDir) + "/" LIBO_ETC_FOLDER + rName, rBitmap);
+        return loadPng( rtl::OUStringConcatenation(OUString::Concat(rBaseDir) + "/" LIBO_ETC_FOLDER + rName), rBitmap);
     }
 }
 
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index f2eaefe9d05b..792dd6a93a8f 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -103,12 +103,12 @@ bool GraphicNativeTransform::rotateGeneric(Degree10 aRotation, std::u16string_vi
 
     BitmapEx aBitmap = mrGraphic.GetBitmapEx();
     aBitmap.Rotate(aRotation, COL_BLACK);
-    rFilter.ExportGraphic(aBitmap, "none", aStream, nFilterFormat, &aFilterData);
+    rFilter.ExportGraphic(aBitmap, u"none", aStream, nFilterFormat, &aFilterData);
 
     aStream.Seek(STREAM_SEEK_TO_BEGIN);
 
     Graphic aGraphic;
-    rFilter.ImportGraphic(aGraphic, "import", aStream);
+    rFilter.ImportGraphic(aGraphic, u"import", aStream);
 
     mrGraphic = aGraphic;
     return true;
@@ -156,7 +156,7 @@ void GraphicNativeTransform::rotateJPEG(Degree10 aRotation)
 
         Graphic aGraphic;
         GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
-        rFilter.ImportGraphic(aGraphic, "import", aTargetStream);
+        rFilter.ImportGraphic(aGraphic, u"import", aTargetStream);
         mrGraphic = aGraphic;
     }
 }
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 758052856f9b..9bc7eea56566 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -157,7 +157,7 @@ sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLo
     return nullptr;
 }
 
-static OUString ImpGetExtension( const OUString &rPath )
+static OUString ImpGetExtension( std::u16string_view rPath )
 {
     OUString        aExt;
     INetURLObject   aURL( rPath );
@@ -202,7 +202,7 @@ bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen)
     return false;
 }
 
-ErrCode GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat )
+ErrCode GraphicFilter::ImpTestOrFindFormat( std::u16string_view rPath, SvStream& rStream, sal_uInt16& rFormat )
 {
     // determine or check the filter/format by reading into it
     if( rFormat == GRFILTER_FORMAT_DONTKNOW )
@@ -215,7 +215,7 @@ ErrCode GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rSt
                 return ERRCODE_NONE;
         }
         // determine filter by file extension
-        if( !rPath.isEmpty() )
+        if( !rPath.empty() )
         {
             OUString aExt( ImpGetExtension( rPath ) );
             rFormat = pConfig->GetImportFormatNumberForExtension( aExt );
@@ -506,7 +506,7 @@ ErrCode GraphicFilter::CanImportGraphic( const INetURLObject& rPath,
     return nRetValue;
 }
 
-ErrCode GraphicFilter::CanImportGraphic( const OUString& rMainUrl, SvStream& rIStream,
+ErrCode GraphicFilter::CanImportGraphic( std::u16string_view rMainUrl, SvStream& rIStream,
                                         sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat )
 {
     sal_uInt64 nStreamPos = rIStream.Tell();
@@ -538,7 +538,7 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rP
 
 ErrCode GraphicFilter::ImportGraphic(
     Graphic& rGraphic,
-    const OUString& rPath,
+    std::u16string_view rPath,
     SvStream& rIStream,
     sal_uInt16 nFormat,
     sal_uInt16* pDeterminedFormat,
@@ -638,7 +638,7 @@ void GraphicFilter::ImportGraphics(std::vector< std::shared_ptr<Graphic> >& rGra
             ResetLastError();
             rContext.m_nStreamBegin = rContext.m_pStream->Tell();
             sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
-            rContext.m_nStatus = ImpTestOrFindFormat(OUString(), *rContext.m_pStream, nFormat);
+            rContext.m_nStatus = ImpTestOrFindFormat(u"", *rContext.m_pStream, nFormat);
             rContext.m_pStream->Seek(rContext.m_nStreamBegin);
 
             // Import the graphic.
@@ -797,7 +797,7 @@ Graphic GraphicFilter::ImportUnloadedGraphic(SvStream& rIStream, sal_uInt64 size
 
     rIStream.Seek(nStreamBegin);
 
-    ErrCode nStatus = ImpTestOrFindFormat("", rIStream, nFormat);
+    ErrCode nStatus = ImpTestOrFindFormat(u"", rIStream, nFormat);
 
     rIStream.Seek(nStreamBegin);
     sal_uInt32 nStreamLength(rIStream.remainingSize());
@@ -1345,7 +1345,7 @@ ErrCode GraphicFilter::readWEBP(SvStream & rStream, Graphic & rGraphic, GfxLinkT
         return ERRCODE_GRFILTER_FILTERERROR;
 }
 
-ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream,
+ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, std::u16string_view rPath, SvStream& rIStream,
                                      sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, GraphicFilterImportFlags nImportFlags,
                                      const css::uno::Sequence< css::beans::PropertyValue >* /*pFilterData*/,
                                      WmfExternal const *pExtHeader )
@@ -1567,7 +1567,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObje
     return nRetValue;
 }
 
-ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& rPath,
+ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, std::u16string_view rPath,
     SvStream& rOStm, sal_uInt16 nFormat, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData )
 {
     SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
@@ -1943,7 +1943,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
     {
         // Import
         nFormat = GetImportFormatNumberForShortName( aShortName );
-        bRet = ImportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == ERRCODE_NONE;
+        bRet = ImportGraphic( rData.maGraphic, u"", rData.mrStm, nFormat ) == ERRCODE_NONE;
     }
     else if( !aShortName.isEmpty() )
     {
@@ -1959,7 +1959,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
         }
 #endif
         nFormat = GetExportFormatNumberForShortName( aShortName );
-        bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat, &aFilterData ) == ERRCODE_NONE;
+        bRet = ExportGraphic( rData.maGraphic, u"", rData.mrStm, nFormat, &aFilterData ) == ERRCODE_NONE;
     }
 
     return bRet;
@@ -2040,7 +2040,7 @@ ErrCode GraphicFilter::compressAsPNG(const Graphic& rGraphic, SvStream& rOutputS
         "Compression", sal_uInt32(9)) };
 
     sal_uInt16 nFilterFormat = GetExportFormatNumberForShortName(u"PNG");
-    return ExportGraphic(rGraphic, OUString(), rOutputStream, nFilterFormat, &aFilterData);
+    return ExportGraphic(rGraphic, u"", rOutputStream, nFilterFormat, &aFilterData);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 0baddbf931ae..e959e465149a 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -141,7 +141,7 @@ bool GfxLink::LoadNative( Graphic& rGraphic ) const
             {
                 GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
                 sal_uInt16 nFormat = rFilter.GetImportFormatNumberForShortName(aShortName);
-                ErrCode nResult = rFilter.ImportGraphic(rGraphic, OUString(), aMemoryStream, nFormat);
+                ErrCode nResult = rFilter.ImportGraphic(rGraphic, u"", aMemoryStream, nFormat);
                 if (nResult == ERRCODE_NONE)
                     bRet = true;
             }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 18f07651528b..c80e5e1c4e81 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5057,7 +5057,7 @@ sal_Int32 PDFWriterImpl::emitNamedDestinations()
             // directly with a reader (provided the reader has the feature) we
             // need to set the name of the destination the same way it will be encoded
             // in an Internet link
-            INetURLObject aLocalURL( "http://ahost.ax" ); //dummy location, won't be used
+            INetURLObject aLocalURL( u"http://ahost.ax" ); //dummy location, won't be used
             aLocalURL.SetMark( rDest.m_aDestName );
 
             const OUString aName   = aLocalURL.GetMark( INetURLObject::DecodeMechanism::NONE ); //same coding as
diff --git a/vcl/source/treelist/imap.cxx b/vcl/source/treelist/imap.cxx
index c0dd97770a27..84a0717c6252 100644
--- a/vcl/source/treelist/imap.cxx
+++ b/vcl/source/treelist/imap.cxx
@@ -107,7 +107,7 @@ void IMapObject::Read( SvStream& rIStm )
     aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
 
     // make URL absolute
-    aURL = URIHelper::SmartRel2Abs( INetURLObject(""), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous );
+    aURL = URIHelper::SmartRel2Abs( INetURLObject(u""), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous );
     IMapCompat aCompat( rIStm, StreamMode::READ );
 
     ReadIMapObject( rIStm );
diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx
index 889b2c061d92..ef78e86bb42d 100644
--- a/vcl/source/treelist/imap2.cxx
+++ b/vcl/source/treelist/imap2.cxx
@@ -361,7 +361,7 @@ OUString ImageMap::ImpReadCERNURL( const char** ppStr )
     aStr = comphelper::string::strip(aStr, ' ');
     aStr = comphelper::string::strip(aStr, '\t');
 
-    return INetURLObject::GetAbsURL( "", aStr );
+    return INetURLObject::GetAbsURL( u"", aStr );
 }
 
 void ImageMap::ImpReadNCSA( SvStream& rIStm )
@@ -445,7 +445,7 @@ OUString ImageMap::ImpReadNCSAURL( const char** ppStr )
         }
     }
 
-    return INetURLObject::GetAbsURL( "", aStr.makeStringAndClear() );
+    return INetURLObject::GetAbsURL( u"", aStr.makeStringAndClear() );
 }
 
 Point ImageMap::ImpReadNCSACoords( const char** ppStr )
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 73c3df80015d..91132addfa94 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -1557,7 +1557,7 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r
             // it's a JPEG, import to BitmapEx
             GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
             Graphic aGraphic;
-            if (rFilter.ImportGraphic(aGraphic, "", *xStm) == ERRCODE_NONE)
+            if (rFilter.ImportGraphic(aGraphic, u"", *xStm) == ERRCODE_NONE)
                 rBmpEx = aGraphic.GetBitmapEx();
         }
 
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index eb2b869217b3..3388c273b974 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -150,7 +150,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory )
     return nAtom;
 }
 
-std::vector<fontID> PrintFontManager::addFontFile( const OUString& rFileUrl )
+std::vector<fontID> PrintFontManager::addFontFile( std::u16string_view rFileUrl )
 {
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     INetURLObject aPath( rFileUrl );
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 3e30cb74fce7..41409d7a07a5 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -239,7 +239,7 @@ bool GenPspGraphics::AddTempDevFont( vcl::font::PhysicalFontCollection*, const O
 }
 
 bool GenPspGraphics::AddTempDevFontHelper( vcl::font::PhysicalFontCollection* pFontCollection,
-                                           const OUString& rFileURL,
+                                           std::u16string_view rFileURL,
                                            const OUString& rFontName)
 {
     // inform PSP font manager
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 584ad041d62a..b8774548547f 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -267,7 +267,7 @@ IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void)
 
     Graphic aGraphicResult;
     GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
-    rFilter.ImportGraphic( aGraphicResult, OUString("import"), aStream );
+    rFilter.ImportGraphic( aGraphicResult, u"import", aStream );
 
     BitmapEx aBitmap = aGraphicResult.GetBitmapEx();