remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals.

Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

16 files changed, 81 insertions, 81 deletions

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index ec51c18d9469..6aadbed9fdde 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -69,7 +69,7 @@ public:
     GLuint Id() { return mnId; }
 
     bool Load( const OUString& rVertexShader, const OUString& rFragmentShader,
-               const rtl::OString& preamble, const rtl::OString& rDigest );
+               const OString& preamble, const OString& rDigest );
     void Use();
     void Reuse();
     void Clean();
diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx
index 76c57722c338..a1042da33a54 100644
--- a/vcl/inc/unx/screensaverinhibitor.hxx
+++ b/vcl/inc/unx/screensaverinhibitor.hxx
@@ -24,7 +24,7 @@
 class VCL_PLUGIN_PUBLIC ScreenSaverInhibitor
 {
 public:
-    void inhibit( bool bInhibit, const rtl::OUString& sReason,
+    void inhibit( bool bInhibit, const OUString& sReason,
                   bool bIsX11, const boost::optional<unsigned int>& xid, boost::optional<Display*> pDisplay );
 
 private:
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index 5f677f1a5655..4de2c5decac0 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -45,8 +45,8 @@ OpenGLProgram::~OpenGLProgram()
 
 bool OpenGLProgram::Load( const OUString& rVertexShader,
                           const OUString& rFragmentShader,
-                          const rtl::OString& preamble,
-                          const rtl::OString& rDigest )
+                          const OString& preamble,
+                          const OString& rDigest )
 {
     mnId = OpenGLHelper::LoadShaders( rVertexShader, rFragmentShader, preamble, rDigest );
     return ( mnId != 0 );
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index ae0ef85e2a34..577e2c2ad3b2 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -283,8 +283,8 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked()
     if (mnGLMajorVersion == 1)
         return true;
 
-    CrashReporter::AddKeyValue("AdapterVendorId", rtl::OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8));
-    CrashReporter::AddKeyValue("AdapterDeviceId", rtl::OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8));
+    CrashReporter::AddKeyValue("AdapterVendorId", OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8));
+    CrashReporter::AddKeyValue("AdapterDeviceId", OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8));
 
     SAL_INFO("vcl.opengl", "Vendor: " << maVendor);
     SAL_INFO("vcl.opengl", "Renderer: " << maRenderer);
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 3c3e3f675fbd..37fb6b3e11c6 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -150,7 +150,7 @@ class ControllerProperties;
 
 class ControllerProperties
 {
-    std::map< int, rtl::OUString >      maTagToPropertyName;
+    std::map< int, OUString >      maTagToPropertyName;
     std::map< int, sal_Int32 >          maTagToValueInt;
     std::map< NSView*, NSView* >        maViewPairMap;
     std::vector< NSObject* >            maViews;
@@ -167,24 +167,24 @@ public:
         static_assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) == 5, "resources not found" );
     }
 
-    static rtl::OUString getMoreString()
+    static OUString getMoreString()
     {
         return VclResId(SV_PRINT_NATIVE_STRINGS[3]);
     }
 
-    static rtl::OUString getPrintSelectionString()
+    static OUString getPrintSelectionString()
     {
         return VclResId(SV_PRINT_NATIVE_STRINGS[4]);
     }
 
-    int addNameTag( const rtl::OUString& i_rPropertyName )
+    int addNameTag( const OUString& i_rPropertyName )
     {
         int nNewTag = mnNextTag++;
         maTagToPropertyName[ nNewTag ] = i_rPropertyName;
         return nNewTag;
     }
 
-    int addNameAndValueTag( const rtl::OUString& i_rPropertyName, sal_Int32 i_nValue )
+    int addNameAndValueTag( const OUString& i_rPropertyName, sal_Int32 i_nValue )
     {
         int nNewTag = mnNextTag++;
         maTagToPropertyName[ nNewTag ] = i_rPropertyName;
@@ -214,7 +214,7 @@ public:
 
     void changePropertyWithIntValue( int i_nTag )
     {
-        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
         std::map< int, sal_Int32 >::const_iterator value_it = maTagToValueInt.find( i_nTag );
         if( name_it != maTagToPropertyName.end() && value_it != maTagToValueInt.end() )
         {
@@ -230,7 +230,7 @@ public:
 
     void changePropertyWithIntValue( int i_nTag, sal_Int64 i_nValue )
     {
-        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
         if( name_it != maTagToPropertyName.end() )
         {
             vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -245,7 +245,7 @@ public:
 
     void changePropertyWithBoolValue( int i_nTag, bool i_bValue )
     {
-        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
         if( name_it != maTagToPropertyName.end() )
         {
             vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -263,9 +263,9 @@ public:
         }
     }
 
-    void changePropertyWithStringValue( int i_nTag, const rtl::OUString& i_rValue )
+    void changePropertyWithStringValue( int i_nTag, const OUString& i_rValue )
     {
-        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
         if( name_it != maTagToPropertyName.end() )
         {
             vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -294,7 +294,7 @@ public:
                        pCell ? [pCell tag] :
                        -1;
 
-            std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
+            std::map< int, OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
             if( name_it != maTagToPropertyName.end() && name_it->second != "PrintContent" )
             {
                 vcl::PrinterController * mpController = [mpAccessoryController printerController];
@@ -314,9 +314,9 @@ public:
 
 };
 
-static OUString filterAccelerator( rtl::OUString const & rText )
+static OUString filterAccelerator( OUString const & rText )
 {
-    rtl::OUStringBuffer aBuf( rText.getLength() );
+    OUStringBuffer aBuf( rText.getLength() );
     for( sal_Int32 nIndex = 0; nIndex != -1; )
         aBuf.append( rText.getToken( 0, '~', nIndex ) );
     return aBuf.makeStringAndClear();
@@ -365,7 +365,7 @@ static OUString filterAccelerator( rtl::OUString const & rText )
     {
         NSTextField* pField = static_cast<NSTextField*>(pSender);
         int nTag = [pField tag];
-        rtl::OUString aValue = GetOUString( [pSender stringValue] );
+        OUString aValue = GetOUString( [pSender stringValue] );
         mpController->changePropertyWithStringValue( nTag, aValue );
     }
     else
@@ -577,7 +577,7 @@ static void adjustTabViews( NSTabView* pTabView, NSSize aTabSize )
     }
 }
 
-static NSControl* createLabel( const rtl::OUString& i_rText )
+static NSControl* createLabel( const OUString& i_rText )
 {
     NSString* pText = CreateNSString( i_rText );
     NSRect aTextRect = { NSZeroPoint, {20, 15} };
@@ -593,7 +593,7 @@ static NSControl* createLabel( const rtl::OUString& i_rText )
     return pTextView;
 }
 
-static sal_Int32 findBreak( const rtl::OUString& i_rText, sal_Int32 i_nPos )
+static sal_Int32 findBreak( const OUString& i_rText, sal_Int32 i_nPos )
 {
     sal_Int32 nRet = i_rText.getLength();
     Reference< i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() );
@@ -609,7 +609,7 @@ static sal_Int32 findBreak( const rtl::OUString& i_rText, sal_Int32 i_nPos )
     return nRet;
 }
 
-static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
+static void linebreakCell( NSCell* pBtn, const OUString& i_rText )
 {
     NSString* pText = CreateNSString( i_rText );
     [pBtn setTitle: pText];
@@ -623,7 +623,7 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
         nIndex = findBreak( i_rText, nIndex );
         if( nIndex < nLen )
         {
-            rtl::OUStringBuffer aBuf( i_rText );
+            OUStringBuffer aBuf( i_rText );
             aBuf[nIndex] = '\n';
             pText = CreateNSString( aBuf.makeStringAndClear() );
             [pBtn setTitle: pText];
@@ -632,7 +632,7 @@ static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
     }
 }
 
-static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString& rText )
+static void addSubgroup( NSView* pCurParent, long& rCurY, const OUString& rText )
 {
     NSControl* pTextView = createLabel( rText );
     [pCurParent addSubview: [pTextView autorelease]];                
@@ -651,8 +651,8 @@ static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString& r
 }
 
 static void addBool( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
-                    const rtl::OUString& rText, bool bEnabled,
-                    const rtl::OUString& rProperty, bool bValue,
+                    const OUString& rText, bool bEnabled,
+                    const OUString& rProperty, bool bValue,
                     std::vector<ColumnItem >& rRightColumn,
                     ControllerProperties* pControllerProperties,
                     ControlTarget* pCtrlTarget
@@ -694,8 +694,8 @@ static void addBool( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
 }
 
 static void addRadio( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
-                     const rtl::OUString& rText,
-                     const rtl::OUString& rProperty, Sequence<rtl::OUString> const & rChoices, sal_Int32 nSelectValue,
+                     const OUString& rText,
+                     const OUString& rProperty, Sequence<OUString> const & rChoices, sal_Int32 nSelectValue,
                      std::vector<ColumnItem >& rLeftColumn,
                      std::vector<ColumnItem >& rRightColumn,
                      ControllerProperties* pControllerProperties,
@@ -770,8 +770,8 @@ static void addRadio( NSView* pCurParent, long rCurX, long& rCurY, long nAttachO
 }
 
 static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttachOffset*/,
-                    const rtl::OUString& rText,
-                    const rtl::OUString& rProperty, Sequence<rtl::OUString> const & rChoices, sal_Int32 nSelectValue,
+                    const OUString& rText,
+                    const OUString& rProperty, Sequence<OUString> const & rChoices, sal_Int32 nSelectValue,
                     std::vector<ColumnItem >& rLeftColumn,
                     std::vector<ColumnItem >& rRightColumn,
                     ControllerProperties* pControllerProperties,
@@ -830,9 +830,9 @@ static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttac
 }
 
 static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
-                    const rtl::OUString& rCtrlType,
-                    const rtl::OUString& rText,
-                    const rtl::OUString& rProperty, const PropertyValue* pValue,
+                    const OUString& rCtrlType,
+                    const OUString& rText,
+                    const OUString& rProperty, const PropertyValue* pValue,
                     sal_Int64 nMinValue, sal_Int64 nMaxValue,
                     std::vector<ColumnItem >& rLeftColumn,
                     std::vector<ColumnItem >& rRightColumn,
@@ -938,7 +938,7 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
 
         if( pValue && pValue->Value.hasValue() )
         {
-            rtl::OUString aValue;
+            OUString aValue;
             pValue->Value >>= aValue;
             if( aValue.getLength() )
             {
@@ -997,9 +997,9 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
         Sequence< beans::PropertyValue > aOptProp;
         rOptions[i].Value >>= aOptProp;
 
-        rtl::OUString aCtrlType;
-        rtl::OUString aPropertyName;
-        Sequence< rtl::OUString > aChoices;
+        OUString aCtrlType;
+        OUString aPropertyName;
+        Sequence< OUString > aChoices;
         Sequence< sal_Bool > aChoicesDisabled;
         sal_Int32 aSelectionChecked = 0;
         for( int n = 0; n < aOptProp.getLength(); n++ )
@@ -1043,11 +1043,11 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
         rOptions[i].Value >>= aOptProp;
 
         // extract ui element
-        rtl::OUString aCtrlType;
-        rtl::OUString aText;
-        rtl::OUString aPropertyName;
-        rtl::OUString aGroupHint;
-        Sequence< rtl::OUString > aChoices;
+        OUString aCtrlType;
+        OUString aText;
+        OUString aPropertyName;
+        OUString aGroupHint;
+        Sequence< OUString > aChoices;
         bool bEnabled = true;
         sal_Int64 nMinValue = 0, nMaxValue = 0;
         long nAttachOffset = 0;
@@ -1122,7 +1122,7 @@ static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOf
                 || ( aCtrlType == "Subgroup" && nCurY < -250 && ! bIgnore )
                )
             {
-                rtl::OUString aGroupTitle( aText );
+                OUString aGroupTitle( aText );
                 if( aCtrlType == "Subgroup" )
                     aGroupTitle = ControllerProperties::getMoreString();
 
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 7bbdc9d8843f..321fa2d6a68c 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -233,7 +233,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
     while( (pFile = [it nextObject]) != nil )
     {
-        const rtl::OUString aFile( GetOUString( pFile ) );
+        const OUString aFile( GetOUString( pFile ) );
         if( ! AquaSalInstance::isOnCommandLine( aFile ) )
         {
             aFileList.push_back( aFile );
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index e23c29a5e379..51fcdf709bc4 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -185,7 +185,7 @@ void Qt5Menu::EnableItem(unsigned nPos, bool bEnable)
     }
 }
 
-void Qt5Menu::SetItemText(unsigned, SalMenuItem* pItem, const rtl::OUString& rText)
+void Qt5Menu::SetItemText(unsigned, SalMenuItem* pItem, const OUString& rText)
 {
     Qt5MenuItem* pSalMenuItem = static_cast<Qt5MenuItem*>(pItem);
     if (pSalMenuItem->mpAction)
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8da8c0355e7d..454c88e23a16 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -183,7 +183,7 @@ struct ImplStyleData
     std::shared_ptr<vcl::IconThemeSelector>
                                     mIconThemeSelector;
 
-    rtl::OUString                   mIconTheme;
+    OUString                   mIconTheme;
     bool                            mbSkipDisabledInMenus;
     bool                            mbHideDisabledMenuItems;
     bool                            mbPreferredContextMenuShortcuts;
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 76ebd74c3ad5..94740fadbcbf 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -49,7 +49,7 @@ NotebookBar::NotebookBar(Window* pParent, const OString& rID, const OUString& rU
         if (i)
             aName += OUString::number(i);
 
-        pContextContainer = dynamic_cast<NotebookbarContextControl*>(m_pUIBuilder->get<Window>(rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8)));
+        pContextContainer = dynamic_cast<NotebookbarContextControl*>(m_pUIBuilder->get<Window>(OUStringToOString(aName, RTL_TEXTENCODING_UTF8)));
         if (pContextContainer)
             m_pContextContainers.push_back(pContextContainer);
         i++;
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 07f5491a11c9..f7fee1a9b21b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -756,7 +756,7 @@ void OpenGLContext::ReleaseFramebuffers()
     BindFramebuffer( nullptr );
 }
 
-OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader, const rtl::OString& preamble )
+OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const OUString& rFragmentShader, const OString& preamble )
 {
     OpenGLZone aZone;
 
@@ -764,7 +764,7 @@ OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const O
     // based on only the names and the preamble. We don't expect
     // shader source files to change during the lifetime of a
     // LibreOffice process.
-    rtl::OString aNameBasedKey = OUStringToOString(rVertexShader + "+" + rFragmentShader, RTL_TEXTENCODING_UTF8) + "+" + preamble;
+    OString aNameBasedKey = OUStringToOString(rVertexShader + "+" + rFragmentShader, RTL_TEXTENCODING_UTF8) + "+" + preamble;
     if( !aNameBasedKey.isEmpty() )
     {
         ProgramCollection::iterator it = maPrograms.find( aNameBasedKey );
@@ -776,7 +776,7 @@ OpenGLProgram* OpenGLContext::GetProgram( const OUString& rVertexShader, const O
     // LibreOffice process instances) based on a hash of their source
     // code, as the source code can and will change between
     // LibreOffice versions even if the shader names don't change.
-    rtl::OString aPersistentKey = OpenGLHelper::GetDigest( rVertexShader, rFragmentShader, preamble );
+    OString aPersistentKey = OpenGLHelper::GetDigest( rVertexShader, rFragmentShader, preamble );
     std::shared_ptr<OpenGLProgram> pProgram = std::make_shared<OpenGLProgram>();
     if( !pProgram->Load( rVertexShader, rFragmentShader, preamble, aPersistentKey ) )
         return nullptr;
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0ae68ec86c13..6ae47184ae2e 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -104,8 +104,8 @@ OString& getShaderSource(const OUString& rFilename)
 }
 
 namespace {
-    int LogCompilerError(GLuint nId, const rtl::OUString &rDetail,
-                         const rtl::OUString &rName, bool bShaderNotProgram)
+    int LogCompilerError(GLuint nId, const OUString &rDetail,
+                         const OUString &rName, bool bShaderNotProgram)
     {
         OpenGLZone aZone;
 
@@ -248,14 +248,14 @@ namespace
 
         osl::Directory::create(url);
 
-        return rtl::OUStringToOString(url, RTL_TEXTENCODING_UTF8);
+        return OUStringToOString(url, RTL_TEXTENCODING_UTF8);
     }
 
 
     bool writeProgramBinary( const OString& rBinaryFileName,
                              const std::vector<sal_uInt8>& rBinary )
     {
-        osl::File aFile(rtl::OStringToOUString(rBinaryFileName, RTL_TEXTENCODING_UTF8));
+        osl::File aFile(OStringToOUString(rBinaryFileName, RTL_TEXTENCODING_UTF8));
         osl::FileBase::RC eStatus = aFile.open(
                 osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
@@ -284,7 +284,7 @@ namespace
     bool readProgramBinary( const OString& rBinaryFileName,
                             std::vector<sal_uInt8>& rBinary )
     {
-        osl::File aFile( rtl::OStringToOUString( rBinaryFileName, RTL_TEXTENCODING_UTF8 ) );
+        osl::File aFile( OStringToOUString( rBinaryFileName, RTL_TEXTENCODING_UTF8 ) );
         if(aFile.open( osl_File_OpenFlag_Read ) == osl::FileBase::E_None)
         {
             sal_uInt64 nSize = 0;
@@ -311,10 +311,10 @@ namespace
     {
         OString aFileName;
         aFileName += getCacheFolder();
-        aFileName += rtl::OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
-        aFileName += rtl::OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+        aFileName += OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+        aFileName += OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
         if (!rGeometryShaderName.isEmpty())
-            aFileName += rtl::OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
+            aFileName += OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-";
         aFileName += rDigest + ".bin";
         return aFileName;
     }
@@ -374,7 +374,7 @@ namespace
     }
 }
 
-rtl::OString OpenGLHelper::GetDigest( const OUString& rVertexShaderName,
+OString OpenGLHelper::GetDigest( const OUString& rVertexShaderName,
                                       const OUString& rFragmentShaderName,
                                       const OString& rPreamble )
 {
diff --git a/vcl/source/window/EnumContext.cxx b/vcl/source/window/EnumContext.cxx
index ec8249d67f1c..9c6d149255da 100644
--- a/vcl/source/window/EnumContext.cxx
+++ b/vcl/source/window/EnumContext.cxx
@@ -27,15 +27,15 @@ namespace vcl {
 
 namespace {
 
-typedef ::std::map<rtl::OUString,EnumContext::Application> ApplicationMap;
+typedef ::std::map<OUString,EnumContext::Application> ApplicationMap;
 
 static ApplicationMap maApplicationMap;
-static o3tl::enumarray<EnumContext::Application, rtl::OUString> maApplicationVector;
+static o3tl::enumarray<EnumContext::Application, OUString> maApplicationVector;
 
-typedef ::std::map<rtl::OUString,EnumContext::Context> ContextMap;
+typedef ::std::map<OUString,EnumContext::Context> ContextMap;
 
 static ContextMap maContextMap;
-static o3tl::enumarray<EnumContext::Context, rtl::OUString> maContextVector;
+static o3tl::enumarray<EnumContext::Context, OUString> maContextVector;
 
 }
 
@@ -57,8 +57,8 @@ EnumContext::EnumContext (
 }
 
 EnumContext::EnumContext (
-    const ::rtl::OUString& rsApplicationName,
-    const ::rtl::OUString& rsContextName)
+    const OUString& rsApplicationName,
+    const OUString& rsContextName)
     : meApplication(GetApplicationEnum(rsApplicationName)),
       meContext(GetContextEnum(rsContextName))
 {
@@ -102,7 +102,7 @@ bool EnumContext::operator!= (const EnumContext& rOther)
         || meContext!=rOther.meContext;
 }
 
-void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Application eApplication)
+void EnumContext::AddEntry (const OUString& rsName, const Application eApplication)
 {
     maApplicationMap[rsName] = eApplication;
     OSL_ASSERT(eApplication<=Application::LAST);
@@ -131,7 +131,7 @@ void EnumContext::ProvideApplicationContainers()
 
 }
 
-EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString& rsApplicationName)
+EnumContext::Application EnumContext::GetApplicationEnum (const OUString& rsApplicationName)
 {
     ProvideApplicationContainers();
 
@@ -143,13 +143,13 @@ EnumContext::Application EnumContext::GetApplicationEnum (const ::rtl::OUString&
         return EnumContext::Application::NONE;
 }
 
-const ::rtl::OUString& EnumContext::GetApplicationName (const Application eApplication)
+const OUString& EnumContext::GetApplicationName (const Application eApplication)
 {
     ProvideApplicationContainers();
     return maApplicationVector[eApplication];
 }
 
-void EnumContext::AddEntry (const ::rtl::OUString& rsName, const Context eContext)
+void EnumContext::AddEntry (const OUString& rsName, const Context eContext)
 {
     maContextMap[rsName] = eContext;
     maContextVector[eContext] = rsName;
@@ -199,7 +199,7 @@ void EnumContext::ProvideContextContainers()
     AddEntry("empty", Context::Empty);
 }
 
-EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsContextName)
+EnumContext::Context EnumContext::GetContextEnum (const OUString& rsContextName)
 {
     ProvideContextContainers();
 
@@ -210,7 +210,7 @@ EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsConte
         return EnumContext::Context::Unknown;
 }
 
-const ::rtl::OUString& EnumContext::GetContextName (const Context eContext)
+const OUString& EnumContext::GetContextName (const Context eContext)
 {
     ProvideContextContainers();
     return maContextVector[eContext];
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 9ae62256a512..d5fd865747ba 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -702,7 +702,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles()
 namespace
 {
 
-bool lcl_matchFilter( const rtl::OUString& rFilter, const rtl::OUString& rExt )
+bool lcl_matchFilter( const OUString& rFilter, const OUString& rExt )
 {
     const sal_Unicode cSep {';'};
     sal_Int32 nIdx {0};
diff --git a/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx b/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
index 1acef8caf48e..1d0925257b9e 100644
--- a/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
+++ b/vcl/unx/gtk3_kde5/filepicker_ipc_commands.hxx
@@ -68,9 +68,9 @@ inline std::vector<char> readIpcStringArg(std::istream& stream)
     return buffer;
 }
 
-void readIpcArg(std::istream& stream, rtl::OUString& string);
+void readIpcArg(std::istream& stream, OUString& string);
 void readIpcArg(std::istream& stream, QString& string);
-void readIpcArg(std::istream& stream, css::uno::Sequence<rtl::OUString>& seq);
+void readIpcArg(std::istream& stream, css::uno::Sequence<OUString>& seq);
 
 inline void readIpcArg(std::istream& stream, Commands& value)
 {
@@ -120,7 +120,7 @@ inline void readIpcArgs(std::istream& stream, T& arg, Args&... args)
     readIpcArgs(stream, args...);
 }
 
-void sendIpcArg(std::ostream& stream, const rtl::OUString& string);
+void sendIpcArg(std::ostream& stream, const OUString& string);
 void sendIpcArg(std::ostream& stream, const QString& string);
 
 inline void sendIpcStringArg(std::ostream& stream, uint32_t length, const char* string)
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index 108bdb49da90..85e772e19468 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -66,10 +66,10 @@ namespace
             OUString sExecDir;
             osl::FileBase::getSystemPathFromFileURL(execdir, sExecDir);
 
-            rtl::OStringBuffer aBuffer("<?xml version=\"1.0\"?>\n<fontconfig><dir>");
+            OStringBuffer aBuffer("<?xml version=\"1.0\"?>\n<fontconfig><dir>");
             aBuffer.append(OUStringToOString(sExecDir + getExecutableName() + ".fonts", osl_getThreadTextEncoding()));
             aBuffer.append("</dir><cachedir>/tmp/cache/fontconfig</cachedir></fontconfig>");
-            rtl::OString aConf = aBuffer.makeStringAndClear();
+            OString aConf = aBuffer.makeStringAndClear();
             sal_uInt64 aBytesWritten;
             aFontConfig.write(aConf.getStr(), aConf.getLength(), aBytesWritten);
             assert(aBytesWritten == aConf.getLength());
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 39743415594d..59d121b70c28 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1653,7 +1653,7 @@ double DemoRenderer::getAndResetBenchmark(const RenderStyle style)
         double avgtime = maRenderers[i]->sumTime / maRenderers[i]->countTime;
         geomean *= avgtime;
         fprintf(stderr, "%s: %f (iteration: %d*%d*%d)\n",
-                rtl::OUStringToOString(maRenderers[i]->getName(),
+                OUStringToOString(maRenderers[i]->getName(),
                 RTL_TEXTENCODING_UTF8).getStr(), avgtime,
                 maRenderers[i]->countTime, maRenderers[i]->getTestRepeatCount(),
                 (style == RENDER_THUMB) ? THUMB_REPEAT_FACTOR : 1);
@@ -2170,7 +2170,7 @@ class DemoApp : public Application
         fprintf(stderr,"  --show <renderer>  - start with a given renderer, options are:\n");
         OUString aRenderers(rRenderer.getRendererList());
         fprintf(stderr,"         %s\n",
-                rtl::OUStringToOString(aRenderers, RTL_TEXTENCODING_UTF8).getStr());
+                OUStringToOString(aRenderers, RTL_TEXTENCODING_UTF8).getStr());
         fprintf(stderr,"  --test <iterCount> - create benchmark data\n");
         fprintf(stderr,"  --widgets          - launch the widget test.\n");
         fprintf(stderr,"  --threads          - render from multiple threads.\n");
@@ -2224,7 +2224,7 @@ public:
                 else if (aArg.startsWith("--"))
                 {
                     fprintf(stderr,"Unknown argument '%s'\n",
-                            rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr());
+                            OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr());
                     return showHelp(aRenderer);
                 }
             }