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>

4 files changed, 25 insertions, 25 deletions

diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index 59c34daad271..d89aa0b6bc16 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -156,7 +156,7 @@ MacOSXBackend* MacOSXBackend::createInstance()
     return new MacOSXBackend;
 }
 
-static rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
+static OUString CFStringToOUString(const CFStringRef sOrig) {
     CFRetain(sOrig);
 
     CFIndex nStringLen = CFStringGetLength(sOrig)+1;
@@ -168,18 +168,18 @@ static rtl::OUString CFStringToOUString(const CFStringRef sOrig) {
 
     CFRelease(sOrig);
 
-    return rtl::OUString::createFromAscii(sBuffer);
+    return OUString::createFromAscii(sBuffer);
 }
 
-static rtl::OUString GetOUString( NSString* pStr )
+static OUString GetOUString( NSString* pStr )
 {
     if( ! pStr )
-        return rtl::OUString();
+        return OUString();
     int nLen = [pStr length];
     if( nLen == 0 )
-        return rtl::OUString();
+        return OUString();
 
-    rtl::OUStringBuffer aBuf( nLen+1 );
+    OUStringBuffer aBuf( nLen+1 );
     aBuf.setLength( nLen );
     [pStr getCharacters:
      reinterpret_cast<unichar *>(const_cast<sal_Unicode*>(aBuf.getStr()))];
@@ -187,7 +187,7 @@ static rtl::OUString GetOUString( NSString* pStr )
 }
 
 void MacOSXBackend::setPropertyValue(
-    rtl::OUString const &, css::uno::Any const &)
+    OUString const &, css::uno::Any const &)
 {
     throw css::lang::IllegalArgumentException(
         "setPropertyValue not supported",
@@ -195,17 +195,17 @@ void MacOSXBackend::setPropertyValue(
 }
 
 css::uno::Any MacOSXBackend::getPropertyValue(
-    rtl::OUString const & PropertyName)
+    OUString const & PropertyName)
 {
     if ( PropertyName == "WorkPathVariable" )
     {
-        rtl::OUString aDocDir;
+        OUString aDocDir;
         NSArray* pPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, true );
         if( pPaths && [pPaths count] > 0 )
         {
             aDocDir = GetOUString( [pPaths objectAtIndex: 0] );
 
-            rtl::OUString aDocURL;
+            OUString aDocURL;
             if( aDocDir.getLength() > 0 &&
                 osl_getFileURLFromSystemPath( aDocDir.pData, &aDocURL.pData ) == osl_File_E_None )
             {
@@ -233,7 +233,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
 
         if (retVal)
         {
-            auto const Server = rtl::OUString::createFromAscii( host );
+            auto const Server = OUString::createFromAscii( host );
             if( Server.getLength() > 0 )
             {
                 return css::uno::makeAny(
@@ -267,7 +267,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
 
         if (retVal)
         {
-            auto const Server = rtl::OUString::createFromAscii( host );
+            auto const Server = OUString::createFromAscii( host );
             if( Server.getLength() > 0 )
             {
                 return css::uno::makeAny(
@@ -301,7 +301,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
 
         if (retVal)
         {
-            auto const Server = rtl::OUString::createFromAscii( host );
+            auto const Server = OUString::createFromAscii( host );
             if( Server.getLength() > 0 )
             {
                 return css::uno::makeAny(
@@ -333,7 +333,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                 true, uno::makeAny( sal_Int32(1) ) ) );
     } else if ( PropertyName == "ooInetNoProxy" )
     {
-        rtl::OUString aProxyBypassList;
+        OUString aProxyBypassList;
 
         CFArrayRef rExceptionsList;
         CFDictionaryRef rProxyDict = SCDynamicStoreCopyProxies(nullptr);
@@ -374,29 +374,29 @@ css::uno::Any MacOSXBackend::getPropertyValue(
     }
 }
 
-rtl::OUString MacOSXBackend::getBackendName(void)
+OUString MacOSXBackend::getBackendName(void)
 {
-    return rtl::OUString("com.sun.star.comp.configuration.backend.MacOSXBackend");
+    return OUString("com.sun.star.comp.configuration.backend.MacOSXBackend");
 }
 
-rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void)
+OUString SAL_CALL MacOSXBackend::getImplementationName(void)
 {
     return getBackendName();
 }
 
-uno::Sequence<rtl::OUString> MacOSXBackend::getBackendServiceNames(void)
+uno::Sequence<OUString> MacOSXBackend::getBackendServiceNames(void)
 {
     uno::Sequence<OUString> aServiceNameList { "com.sun.star.configuration.backend.MacOSXBackend" };
 
     return aServiceNameList;
 }
 
-sal_Bool SAL_CALL MacOSXBackend::supportsService(const rtl::OUString& aServiceName)
+sal_Bool SAL_CALL MacOSXBackend::supportsService(const OUString& aServiceName)
 {
     return cppu::supportsService(this, aServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void)
+uno::Sequence<OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void)
 {
     return getBackendServiceNames();
 }
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 7589cc014ee3..eb931f23b683 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -208,7 +208,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
     Reference< XSimpleMailMessage2 > xMessage( xSimpleMailMessage, UNO_QUERY );
     if ( xMessage.is() )
     {
-        rtl::OUString sBody = xMessage->getBody();
+        OUString sBody = xMessage->getBody();
         if ( sBody.getLength() > 0 )
         {
             aBuffer.append(" --body ");
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index 63b17216cf0f..7a622b3fe0db 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -31,12 +31,12 @@ CSmplMailMsg::CSmplMailMsg( )
 {
 }
 
-void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody )
+void SAL_CALL CSmplMailMsg::setBody( const OUString& aBody )
 {
     m_aBody = aBody;
 }
 
-::rtl::OUString SAL_CALL CSmplMailMsg::getBody(  )
+OUString SAL_CALL CSmplMailMsg::getBody(  )
 {
     return m_aBody;
 }
diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx
index ef87341c03b5..4797f4e81e2e 100644
--- a/shell/source/win32/simplemail/smplmailmsg.hxx
+++ b/shell/source/win32/simplemail/smplmailmsg.hxx
@@ -34,9 +34,9 @@ class CSmplMailMsg : public cppu::WeakImplHelper< css::system::XSimpleMailMessag
 public:
     CSmplMailMsg( );
 
-    virtual void SAL_CALL setBody( const ::rtl::OUString& aBody ) override;
+    virtual void SAL_CALL setBody( const OUString& aBody ) override;
 
-    virtual ::rtl::OUString SAL_CALL getBody(  ) override;
+    virtual OUString SAL_CALL getBody(  ) override;
 
 
     virtual void SAL_CALL setRecipient( const OUString& aRecipient ) override;