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>

13 files changed, 40 insertions, 40 deletions

diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index d1345552b92f..49e86bfeec2e 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -107,7 +107,7 @@ private:
 
 template< typename Val >
 RegexpMapConstIter< Val >::RegexpMapConstIter():
-    m_aEntry(rtl::OUString(), 0),
+    m_aEntry(OUString(), 0),
     m_pMap(nullptr),
     m_nList(-1),
     m_bEntrySet(false)
@@ -116,7 +116,7 @@ RegexpMapConstIter< Val >::RegexpMapConstIter():
 template< typename Val >
 RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap,
                                             bool bBegin):
-    m_aEntry(rtl::OUString(), 0),
+    m_aEntry(OUString(), 0),
     m_pMap(pTheMap),
     m_bEntrySet(false)
 {
@@ -137,7 +137,7 @@ template< typename Val >
 inline RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap,
                                                    int nTheList,
                                                    ListIterator aTheIndex):
-    m_aEntry(rtl::OUString(), 0),
+    m_aEntry(OUString(), 0),
     m_aIndex(aTheIndex),
     m_pMap(pTheMap),
     m_nList(nTheList),
@@ -299,7 +299,7 @@ private:
 };
 
 template< typename Val >
-void RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue)
+void RegexpMap< Val >::add(OUString const & rKey, Val const & rValue)
 {
     Regexp aRegexp(Regexp::parse(rKey));
 
@@ -328,7 +328,7 @@ void RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue)
 }
 
 template< typename Val >
-typename RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey)
+typename RegexpMap< Val >::iterator RegexpMap< Val >::find(OUString const & rKey)
 {
     Regexp aRegexp(Regexp::parse(rKey));
 
@@ -399,7 +399,7 @@ typename RegexpMap< Val >::size_type RegexpMap< Val >::size() const
 }
 
 template< typename Val >
-Val const * RegexpMap< Val >::map(rtl::OUString const & rString) const
+Val const * RegexpMap< Val >::map(OUString const & rString) const
 {
     for (int n = Regexp::KIND_DOMAIN; n >= Regexp::KIND_PREFIX; --n)
     {
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 09d0a88b7be0..30ec5256f965 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -138,7 +138,7 @@ public:
     /// @throws DAVException
     void
     GET0( DAVRequestHeaders & rRequestHeaders,
-          const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
+          const std::vector< OUString > & rHeaderNames, // empty == 'all'
           DAVResource & rResource,
           const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 86cac8850bce..4616957b0725 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -104,8 +104,8 @@ namespace
     // implement a GET to substitute HEAD, when HEAD not available
     void lcl_sendPartialGETRequest( bool &bError,
                                            DAVException &aLastException,
-                                           const std::vector< rtl::OUString >& rProps,
-                                           std::vector< rtl::OUString > &aHeaderNames,
+                                           const std::vector< OUString >& rProps,
+                                           std::vector< OUString > &aHeaderNames,
                                            const std::unique_ptr< DAVResourceAccess > &xResAccess,
                                            std::unique_ptr< ContentProperties > &xProps,
                                            const uno::Reference< ucb::XCommandEnvironment >& xEnv )
@@ -116,7 +116,7 @@ namespace
                                   OUString( "bytes=0-0" ) );
 
         bool bIsRequestSize = std::any_of(aHeaderNames.begin(), aHeaderNames.end(),
-            [](const rtl::OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
+            [](const OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
 
         if ( bIsRequestSize )
         {
@@ -135,7 +135,7 @@ namespace
                 // the ContentProperties maps "Content-Length" to the UCB "Size" property
                 // This would have an unrealistic value of 1 byte because we did only a partial GET
                 // Solution: if "Content-Range" is present, map it with UCB "Size" property
-                rtl::OUString aAcceptRanges, aContentRange, aContentLength;
+                OUString aAcceptRanges, aContentRange, aContentLength;
                 std::vector< DAVPropertyValue > &aResponseProps = aResource.properties;
                 for ( const auto& rResponseProp : aResponseProps )
                 {
@@ -169,7 +169,7 @@ namespace
                     sal_Int32 nSlash = aContentRange.lastIndexOf( '/' );
                     if ( nSlash != -1 )
                     {
-                        rtl::OUString aSize = aContentRange.copy( nSlash + 1 );
+                        OUString aSize = aContentRange.copy( nSlash + 1 );
                         // "*" means that the instance-length is unknown at the time when the response was generated
                         if ( aSize != "*" )
                         {
@@ -4165,7 +4165,7 @@ bool Content::isResourceAvailable( const css::uno::Reference< css::ucb::XCommand
                                   const std::unique_ptr< DAVResourceAccess > & rResAccess,
                                   DAVOptions& rDAVOptions )
 {
-    std::vector< rtl::OUString > aHeaderNames;
+    std::vector< OUString > aHeaderNames;
     DAVResource aResource;
 
     try
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 4d52efcf5e6b..d86371d17bc8 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -592,7 +592,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 "removeProperty",
                 -1,
-                cppu::UnoType<rtl::OUString>::get() );
+                cppu::UnoType<OUString>::get() );
 
     bool bFolder = false;
 
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index 34537d29e663..a08a8488da15 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -180,7 +180,7 @@ bool DAVProperties::isUCBDeadProperty( const SerfPropName & rName )
                == 0 ) );
 }
 
-bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OUString& rParsedName)
+bool DAVProperties::isUCBSpecialProperty(const OUString& rFullName, OUString& rParsedName)
 {
     sal_Int32 nLen = rFullName.getLength();
     if ( nLen <= 0 ||
@@ -193,7 +193,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
     if ( nEnd == -1 )
         return false;
 
-    rtl::OUString sPropName = rFullName.copy( nStart, nEnd - nStart );
+    OUString sPropName = rFullName.copy( nStart, nEnd - nStart );
     if ( !sPropName.getLength() )
         return false;
 
@@ -206,11 +206,11 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
     if ( nEnd != nLen - RTL_CONSTASCII_LENGTH( "\">" ) )
         return false;
 
-    rtl::OUString sNamesp = rFullName.copy( nStart, nEnd - nStart );
+    OUString sNamesp = rFullName.copy( nStart, nEnd - nStart );
     if ( !( nLen = sNamesp.getLength() ) )
         return false;
 
-    rtl::OUStringBuffer aBuff( sNamesp );
+    OUStringBuffer aBuff( sNamesp );
     if ( sNamesp[nLen - 1] != '/' )
         aBuff.append( '/' );
     aBuff.append( sPropName );
diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx
index e8103fbe45af..926afd6a765f 100644
--- a/ucb/source/ucp/webdav/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav/DAVProperties.hxx
@@ -49,8 +49,8 @@ struct DAVProperties
                                     OUString & rFullName );
 
     static bool isUCBDeadProperty( const SerfPropName & rName );
-    static bool isUCBSpecialProperty( const rtl::OUString & rFullName,
-                                      rtl::OUString & rParsedName );
+    static bool isUCBSpecialProperty( const OUString & rFullName,
+                                      OUString & rParsedName );
 };
 
 } // namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 2132cb095390..6ff0458dd2fa 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1027,7 +1027,7 @@ const OUString & DAVResourceAccess::getRequestURI() const
 // static
 void DAVResourceAccess::getUserRequestHeaders(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv,
-    const rtl::OUString & rURI,
+    const OUString & rURI,
     ucb::WebDAVHTTPMethod eMethod,
     DAVRequestHeaders & rRequestHeaders )
 {
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index f6c0ce9322ed..37d76d83f42e 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -118,7 +118,7 @@ public:
     /// @throws DAVException
     css::uno::Reference< css::io::XInputStream >
     GET( DAVRequestHeaders & rRequestHeaders,
-         const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all'
+         const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
@@ -189,7 +189,7 @@ public:
     static void
     getUserRequestHeaders(
         const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
-        const rtl::OUString & rURI,
+        const OUString & rURI,
         css::ucb::WebDAVHTTPMethod eMethod,
         DAVRequestHeaders & rRequestHeaders );
 
diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
index 57502dc3ccbd..4540ccbd0124 100644
--- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
@@ -65,7 +65,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
                                : 0;
         if ( nPropCount > 0 )
         {
-            rtl::OUStringBuffer aBuffer;
+            OUStringBuffer aBuffer;
             // add PropPatch xml header in front
             aBuffer.append( PROPPATCH_HEADER );
 
@@ -137,7 +137,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
             // add PropPatch xml trailer at end
             aBuffer.append( PROPPATCH_TRAILER );
 
-            aBodyText = rtl::OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
+            aBodyText = OUStringToOString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
             body_bkt = serf_bucket_simple_copy_create( aBodyText.getStr(),
                                                        aBodyText.getLength(),
                                                        pSerfBucketAlloc );
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 51a29a7445bf..6bcdc0b1ec11 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -462,7 +462,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
         {
             uno::Reference< security::XCertificateExtension >element = extensions[i];
 
-            const rtl::OString aId ( reinterpret_cast<const sal_Char *>(const_cast<const signed char *>(element->getExtensionId().getArray())), element->getExtensionId().getLength());
+            const OString aId ( reinterpret_cast<const sal_Char *>(const_cast<const signed char *>(element->getExtensionId().getArray())), element->getExtensionId().getLength());
             if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
             {
                 uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY );
@@ -471,7 +471,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
             }
         }
 
-        uno::Sequence< ::rtl::OUString > certHostNames(altNames.getLength() + 1);
+        uno::Sequence< OUString > certHostNames(altNames.getLength() + 1);
         certHostNames[0] = sServerCertificateSubject;
         for( int n = 0; n < altNames.getLength(); ++n )
         {
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index a6e7087c26a2..72913059c5e3 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -90,8 +90,8 @@ namespace
 {
 void lcl_sendPartialGETRequest( bool &bError,
                                 DAVException &aLastException,
-                                const std::vector< rtl::OUString >& rProps,
-                                std::vector< rtl::OUString > &aHeaderNames,
+                                const std::vector< OUString >& rProps,
+                                std::vector< OUString > &aHeaderNames,
                                 const std::unique_ptr< DAVResourceAccess > &xResAccess,
                                 std::unique_ptr< ContentProperties > &xProps,
                                 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
@@ -104,7 +104,7 @@ void lcl_sendPartialGETRequest( bool &bError,
             OUString( "bytes=0-0" )));
 
     bool bIsRequestSize = std::any_of(aHeaderNames.begin(), aHeaderNames.end(),
-        [](const rtl::OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
+        [](const OUString& rHeaderName) { return rHeaderName == "Content-Length"; });
 
     if ( bIsRequestSize )
     {
@@ -126,7 +126,7 @@ void lcl_sendPartialGETRequest( bool &bError,
             // the ContentProperties maps "Content-Length" to the UCB "Size" property
             // This would have an unrealistic value of 1 byte because we did only a partial GET
             // Solution: if "Content-Range" is present, map it with UCB "Size" property
-            rtl::OUString aAcceptRanges, aContentRange, aContentLength;
+            OUString aAcceptRanges, aContentRange, aContentLength;
             std::vector< DAVPropertyValue > &aResponseProps = aResource.properties;
             for ( const auto& rResponseProp : aResponseProps )
             {
@@ -157,7 +157,7 @@ void lcl_sendPartialGETRequest( bool &bError,
                 sal_Int32 nSlash = aContentRange.lastIndexOf( '/' );
                 if ( nSlash != -1 )
                 {
-                    rtl::OUString aSize = aContentRange.copy( nSlash + 1 );
+                    OUString aSize = aContentRange.copy( nSlash + 1 );
                     // "*" means that the instance-length is unknown at the time when the response was generated
                     if ( aSize != "*" )
                     {
@@ -710,7 +710,7 @@ uno::Any SAL_CALL Content::execute(
     }
     else if ( aCommand.Name == "removeProperty" )
     {
-        rtl::OUString sPropName;
+        OUString sPropName;
         if ( !( aCommand.Argument >>= sPropName ) )
         {
             ucbhelper::cancelCommandExecution(
@@ -815,7 +815,7 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
 
     // Take into account special properties with custom namespace
     // using <prop:the_propname xmlns:prop="the_namespace">
-    rtl::OUString aSpecialName;
+    OUString aSpecialName;
     bool bIsSpecial = DAVProperties::isUCBSpecialProperty( aProperty.Name, aSpecialName );
 
     // Note: This requires network access!
@@ -912,7 +912,7 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
     }
 }
 
-void Content::removeProperty( const rtl::OUString& Name,
+void Content::removeProperty( const OUString& Name,
                               const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 {
 #if 0
@@ -1016,7 +1016,7 @@ void Content::removeProperty( const rtl::OUString& Name,
 }
 
 // virtual
-void SAL_CALL Content::addProperty( const rtl::OUString& Name,
+void SAL_CALL Content::addProperty( const OUString& Name,
                                     sal_Int16 Attributes,
                                     const uno::Any& DefaultValue )
 {
@@ -1031,7 +1031,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
 }
 
 // virtual
-void SAL_CALL Content::removeProperty( const rtl::OUString& Name )
+void SAL_CALL Content::removeProperty( const OUString& Name )
 {
     removeProperty( Name,
                     uno::Reference< ucb::XCommandEnvironment >() );
@@ -1709,7 +1709,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             // Optional props.
 
 
-            rtl::OUString aSpecialName;
+            OUString aSpecialName;
             bool bIsSpecial = DAVProperties::isUCBSpecialProperty( rName, aSpecialName );
 
             if ( !xInfo.is() )
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx
index 5c0b47bda8ce..68cf8e5d24fc 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -182,7 +182,7 @@ private:
     /// @throws css::beans::PropertyExistException
     /// @throws css::beans::NotRemoveableException
     /// @throws css::uno::RuntimeException
-    void removeProperty( const rtl::OUString& Name,
+    void removeProperty( const OUString& Name,
                          const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment );
 public:
     /// @throws css::ucb::ContentCreationException
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 485be38470cf..2259929f523b 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -543,7 +543,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
             ucb::CommandInfo(
                 "removeProperty",
                 -1,
-                cppu::UnoType<rtl::OUString>::get() );
+                cppu::UnoType<OUString>::get() );
 
     bool bFolder = false;