4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 3e20c12f2720..ca9fb352eb74 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -389,7 +389,7 @@ void PDFWriter::CreateNote( const tools::Rectangle& rRect, const PDFNote& rNote,
     xImplementation->createNote( rRect, rNote, nPageNr );
 }
 
-sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias )
+sal_Int32 PDFWriter::BeginStructureElement( PDFWriter::StructElement eType, std::u16string_view rAlias )
 {
     return xImplementation->beginStructureElement( eType, rAlias );
 }
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 38c8414fbeb4..5e6955a0a45b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10407,7 +10407,7 @@ bool PDFWriterImpl::checkEmitStructure()
     return bEmit;
 }
 
-sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, const OUString& rAlias )
+sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, std::u16string_view rAlias )
 {
     if( m_nCurrentPage < 0 )
         return -1;
@@ -10454,9 +10454,9 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType,
     m_nCurrentStructElement = nNewId;
 
     // handle alias names
-    if( !rAlias.isEmpty() && eType != PDFWriter::NonStructElement )
+    if( !rAlias.empty() && eType != PDFWriter::NonStructElement )
     {
-        OStringBuffer aNameBuf( rAlias.getLength() );
+        OStringBuffer aNameBuf( rAlias.size() );
         appendName( rAlias, aNameBuf );
         OString aAliasName( aNameBuf.makeStringAndClear() );
         rEle.m_aAlias = aAliasName;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index de5385f93ac2..4adef21660ba 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -414,9 +414,9 @@ static bool lcl_CanApplyAsianKerning(sal_Unicode cp)
     return (0x3000 == (cp & 0xFF00)) || (0xFF00 == (cp & 0xFF00)) || (0x2010 == (cp & 0xFFF0));
 }
 
-void GenericSalLayout::ApplyAsianKerning(const OUString& rStr)
+void GenericSalLayout::ApplyAsianKerning(std::u16string_view rStr)
 {
-    const int nLength = rStr.getLength();
+    const int nLength = rStr.size();
     double nOffset = 0;
 
     for (std::vector<GlyphItem>::iterator pGlyphIter = m_GlyphItems.begin(),
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 25bf47767ec7..2d0219041ba2 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -148,9 +148,9 @@ namespace vcl
 
     namespace
     {
-        bool lcl_normalizeLength( const OUString& _rText, const sal_Int32 _nStartIndex, sal_Int32& _io_nLength )
+        bool lcl_normalizeLength( std::u16string_view _rText, const sal_Int32 _nStartIndex, sal_Int32& _io_nLength )
         {
-            sal_Int32 nTextLength = _rText.getLength();
+            sal_Int32 nTextLength = _rText.size();
             if ( _nStartIndex > nTextLength )
                 return false;
             if ( _nStartIndex + _io_nLength > nTextLength )