mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

8 files changed, 127 insertions, 127 deletions

diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index 3cf3fa02ade3..0f0ea21181b1 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -82,9 +82,9 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getUri()
+    virtual OUString SAL_CALL getUri()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getResourceName()
+    virtual OUString SAL_CALL getResourceName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // XInputStream
@@ -121,16 +121,16 @@ public:
     virtual void SAL_CALL truncate()
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw (::com::sun::star::uno::RuntimeException);
 
     //::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > SAL_CALL XTempFile_createInstance( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
-    static ::rtl::OUString getImplementationName_Static ();
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > getSupportedServiceNames_Static();
+    static OUString getImplementationName_Static ();
+    static ::com::sun::star::uno::Sequence < OUString > getSupportedServiceNames_Static();
 
     static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static();
 
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index e02da35de73d..25b2adfdbfbf 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -73,15 +73,15 @@ sal_Bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUStrin
     return !rReturn.isEmpty();
 }
 
-bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn)
+bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn)
 {
-    rReturn = ::rtl::OUString();
+    rReturn = OUString();
     Reference< XUniversalContentBroker > pBroker(
         UniversalContentBroker::create(
             comphelper::getProcessComponentContext() ) );
     try
     {
-        rtl::OUString aBase( ::ucbhelper::getLocalFileURL() );
+        OUString aBase( ::ucbhelper::getLocalFileURL() );
         rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName );
     }
     catch (const ::com::sun::star::uno::RuntimeException&)
@@ -91,7 +91,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::
     return !rReturn.isEmpty();
 }
 
-bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::OUString& rReturn)
+bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& rReturn)
 {
     rReturn = "";
     Reference< XUniversalContentBroker > pBroker(
@@ -111,21 +111,21 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::
     return !rReturn.isEmpty();
 }
 
-sal_Bool LocalFileHelper::IsLocalFile(const rtl::OUString& rName)
+sal_Bool LocalFileHelper::IsLocalFile(const OUString& rName)
 {
-    rtl::OUString aTmp;
+    OUString aTmp;
     return ConvertURLToPhysicalName(rName, aTmp);
 }
 
-sal_Bool LocalFileHelper::IsFileContent(const rtl::OUString& rName)
+sal_Bool LocalFileHelper::IsFileContent(const OUString& rName)
 {
     OUString aTmp;
     return ConvertURLToSystemPath(rName, aTmp);
 }
 
-typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
+typedef ::std::vector< OUString* > StringList_Impl;
 
-::com::sun::star::uno::Sequence < ::rtl::OUString > LocalFileHelper::GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder )
+::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, sal_Bool bFolder )
 {
     StringList_Impl* pFiles = NULL;
     try
@@ -134,8 +134,8 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
             rFolder, Reference< XCommandEnvironment >(),
             comphelper::getProcessComponentContext() );
         Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > aProps(1);
-        ::rtl::OUString* pProps = aProps.getArray();
+        ::com::sun::star::uno::Sequence< OUString > aProps(1);
+        OUString* pProps = aProps.getArray();
         pProps[0] = "Url";
 
         try
@@ -158,8 +158,8 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
             {
                 while ( xResultSet->next() )
                 {
-                    ::rtl::OUString aId = xContentAccess->queryContentIdentifierString();
-                    ::rtl::OUString* pFile = new ::rtl::OUString( aId );
+                    OUString aId = xContentAccess->queryContentIdentifierString();
+                    OUString* pFile = new OUString( aId );
                     pFiles->push_back( pFile );
                 }
             }
@@ -178,11 +178,11 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
     if ( pFiles )
     {
         size_t nCount = pFiles->size();
-        Sequence < ::rtl::OUString > aRet( nCount );
-        ::rtl::OUString* pRet = aRet.getArray();
+        Sequence < OUString > aRet( nCount );
+        OUString* pRet = aRet.getArray();
         for ( size_t i = 0; i < nCount; ++i )
         {
-            ::rtl::OUString* pFile = (*pFiles)[ i ];
+            OUString* pFile = (*pFiles)[ i ];
             pRet[i] = *( pFile );
             delete pFile;
         }
@@ -190,7 +190,7 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl;
         return aRet;
     }
     else
-        return Sequence < ::rtl::OUString > ();
+        return Sequence < OUString > ();
 }
 
 }
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 8480bf18692a..0d8920bf9e64 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -31,7 +31,7 @@ ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::co
 {
 }
 
-sal_Bool getStatusFromAny_Impl( const Any& aAny, ::rtl::OUString& aText, sal_Int32& nNum )
+sal_Bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
 {
     sal_Bool bNumIsSet = sal_False;
 
@@ -54,7 +54,7 @@ void SAL_CALL ProgressHandlerWrap::push( const Any& Status )
     if( !m_xStatusIndicator.is() )
         return;
 
-    ::rtl::OUString aText;
+    OUString aText;
     sal_Int32 nRange;
 
     if( getStatusFromAny_Impl( Status, aText, nRange ) )
@@ -67,7 +67,7 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status )
     if( !m_xStatusIndicator.is() )
         return;
 
-    ::rtl::OUString aText;
+    OUString aText;
     sal_Int32 nValue;
 
     if( getStatusFromAny_Impl( Status, aText, nValue ) )
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 807c776826cb..798f61be5816 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -41,7 +41,7 @@ using namespace osl;
 namespace
 {
     struct TempNameBase_Impl
-        : public rtl::Static< ::rtl::OUString, TempNameBase_Impl > {};
+        : public rtl::Static< OUString, TempNameBase_Impl > {};
 }
 
 namespace utl
@@ -59,23 +59,23 @@ struct TempFile_Impl
                     {}
 };
 
-rtl::OUString getParentName( const rtl::OUString& aFileName )
+OUString getParentName( const OUString& aFileName )
 {
     sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') );
-    rtl::OUString aParent = aFileName.copy( 0,lastIndex );
+    OUString aParent = aFileName.copy( 0,lastIndex );
 
     if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
-        aParent += rtl::OUString("/");
+        aParent += OUString("/");
 
     if( 0 == aParent.compareToAscii( "file://" ) )
-        aParent = rtl::OUString("file:///");
+        aParent = OUString("file:///");
 
     return aParent;
 }
 
-sal_Bool ensuredir( const rtl::OUString& rUnqPath )
+sal_Bool ensuredir( const OUString& rUnqPath )
 {
-    rtl::OUString aPath;
+    OUString aPath;
     if ( rUnqPath.isEmpty() )
         return sal_False;
 
@@ -106,7 +106,7 @@ umask(old_mode);
     if( !bSuccess )
     {
         // perhaps parent(s) don't exist
-        rtl::OUString aParentDir = getParentName( aPath );
+        OUString aParentDir = getParentName( aPath );
         if ( aParentDir != aPath )
         {
             bSuccess = ensuredir( getParentName( aPath ) );
@@ -135,10 +135,10 @@ String ConstructTempDir_Impl( const String* pParent )
                     comphelper::getProcessComponentContext() ) );
 
         // if parent given try to use it
-        rtl::OUString aTmp( *pParent );
+        OUString aTmp( *pParent );
 
         // test for valid filename
-        rtl::OUString aRet;
+        OUString aRet;
         ::osl::FileBase::getFileURLFromSystemPath(
             ::ucbhelper::getSystemPathFromFileURL( pBroker, aTmp ),
             aRet );
@@ -156,10 +156,10 @@ String ConstructTempDir_Impl( const String* pParent )
 
     if ( !aName.Len() )
     {
-        ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get();
+        OUString &rTempNameBase_Impl = TempNameBase_Impl::get();
         if (rTempNameBase_Impl.isEmpty())
         {
-            ::rtl::OUString ustrTempDirURL;
+            OUString ustrTempDirURL;
             ::osl::FileBase::RC rc = ::osl::File::getTempDirURL(
                 ustrTempDirURL );
             if (rc == ::osl::FileBase::E_None)
@@ -186,7 +186,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
     unsigned const nRadix = 36;
     unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix);
     String aName( rName );
-    aName += rtl::OUString( "lu" );
+    aName += OUString( "lu" );
 
     rName.Erase();
     static unsigned long u = Time::GetSystemTicks() % nMax;
@@ -194,8 +194,8 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
     {
         u %= nMax;
         String aTmp( aName );
-        aTmp += rtl::OUString::valueOf(static_cast<sal_Int64>(u), nRadix);
-        aTmp += rtl::OUString( ".tmp" );
+        aTmp += OUString::valueOf(static_cast<sal_Int64>(u), nRadix);
+        aTmp += OUString( ".tmp" );
 
         if ( bDir )
         {
@@ -271,7 +271,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _
         if ( pExtension )
             aTmp += *pExtension;
         else
-            aTmp += rtl::OUString( ".tmp" );
+            aTmp += OUString( ".tmp" );
         if ( bDirectory )
         {
             FileBase::RC err = Directory::create( aTmp );
@@ -329,7 +329,7 @@ String TempFile::CreateTempName( const String* pParent )
     CreateTempName_Impl( aName, sal_False );
 
     // convert to file URL
-    rtl::OUString aTmp;
+    OUString aTmp;
     if ( aName.Len() )
         FileBase::getSystemPathFromFileURL( aName, aTmp );
     return aTmp;
@@ -387,7 +387,7 @@ sal_Bool TempFile::IsValid() const
 
 String TempFile::GetFileName() const
 {
-    rtl::OUString aTmp;
+    OUString aTmp;
     FileBase::getSystemPathFromFileURL( pImp->aName, aTmp );
     return aTmp;
 }
@@ -396,7 +396,7 @@ String TempFile::GetURL() const
 {
     if ( !pImp->aURL.Len() )
     {
-        rtl::OUString aTmp;
+        OUString aTmp;
         LocalFileHelper::ConvertPhysicalNameToURL( GetFileName(), aTmp );
         pImp->aURL = aTmp;
     }
@@ -431,7 +431,7 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName )
     if( !rBaseName.Len() )
         return String();
 
-    rtl::OUString aUnqPath( rBaseName );
+    OUString aUnqPath( rBaseName );
 
     // remove trailing slash
     if ( rBaseName.GetChar( rBaseName.Len() - 1 ) == sal_Unicode( '/' ) )
@@ -447,14 +447,14 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName )
         bRet = sal_True;
 
     // failure to create base directory means returning an empty string
-    rtl::OUString aTmp;
+    OUString aTmp;
     if ( bRet )
     {
         // append own internal directory
         bRet = sal_True;
-        ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get();
+        OUString &rTempNameBase_Impl = TempNameBase_Impl::get();
         rTempNameBase_Impl = rBaseName;
-        rTempNameBase_Impl += rtl::OUString('/');
+        rTempNameBase_Impl += OUString('/');
 
         TempFile aBase( NULL, sal_True );
         if ( aBase.IsValid() )
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 6d00271eff1b..9dbd82a9b1cb 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -60,13 +60,13 @@
 
 namespace {
 
-rtl::OUString canonic(rtl::OUString const & url) {
+OUString canonic(OUString const & url) {
     INetURLObject o(url);
     SAL_WARN_IF(o.HasError(), "unotools.ucbhelper", "Invalid URL \"" << url << '"');
     return o.GetMainURL(INetURLObject::NO_DECODE);
 }
 
-ucbhelper::Content content(rtl::OUString const & url) {
+ucbhelper::Content content(OUString const & url) {
     return ucbhelper::Content(
         canonic(url),
         css::uno::Reference<css::ucb::XCommandEnvironment>(),
@@ -80,12 +80,12 @@ ucbhelper::Content content(INetURLObject const & url) {
         comphelper::getProcessComponentContext());
 }
 
-std::vector<rtl::OUString> getContents(rtl::OUString const & url) {
+std::vector<OUString> getContents(OUString const & url) {
     try {
-        std::vector<rtl::OUString> cs;
+        std::vector<OUString> cs;
         ucbhelper::Content c(content(url));
-        css::uno::Sequence<rtl::OUString> args(1);
-        args[0] = rtl::OUString("Title");
+        css::uno::Sequence<OUString> args(1);
+        args[0] = OUString("Title");
         css::uno::Reference<css::sdbc::XResultSet> res(
             c.createCursor(args, ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS),
             css::uno::UNO_SET_THROW);
@@ -106,16 +106,16 @@ std::vector<rtl::OUString> getContents(rtl::OUString const & url) {
             "unotools.ucbhelper",
             "getContents(" << url << ") " << e.getValueType().getTypeName()
                 << " \"" << e.get<css::uno::Exception>().Message << '"');
-        return std::vector<rtl::OUString>();
+        return std::vector<OUString>();
     }
 }
 
-rtl::OUString getCasePreservingUrl(INetURLObject url) {
+OUString getCasePreservingUrl(INetURLObject url) {
     return
         content(url).executeCommand(
-            rtl::OUString("getCasePreservingURL"),
+            OUString("getCasePreservingURL"),
             css::uno::Any()).
-        get<rtl::OUString>();
+        get<OUString>();
 }
 
 DateTime convert(css::util::DateTime const & dt) {
@@ -126,7 +126,7 @@ DateTime convert(css::util::DateTime const & dt) {
 
 }
 
-bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) {
+bool utl::UCBContentHelper::IsDocument(OUString const & url) {
     try {
         return content(url).isDocument();
     } catch (css::uno::RuntimeException const &) {
@@ -146,7 +146,7 @@ bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) {
 }
 
 css::uno::Any utl::UCBContentHelper::GetProperty(
-    rtl::OUString const & url, rtl::OUString const & property)
+    OUString const & url, OUString const & property)
 {
     try {
         return content(url).getPropertyValue(property);
@@ -166,7 +166,7 @@ css::uno::Any utl::UCBContentHelper::GetProperty(
     }
 }
 
-bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) {
+bool utl::UCBContentHelper::IsFolder(OUString const & url) {
     try {
         return content(url).isFolder();
     } catch (css::uno::RuntimeException const &) {
@@ -186,11 +186,11 @@ bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) {
 }
 
 bool utl::UCBContentHelper::GetTitle(
-    rtl::OUString const & url, rtl::OUString * title)
+    OUString const & url, OUString * title)
 {
     assert(title != 0);
     try {
-        return content(url).getPropertyValue(rtl::OUString("Title")) >>= *title;
+        return content(url).getPropertyValue(OUString("Title")) >>= *title;
     } catch (css::uno::RuntimeException const &) {
         throw;
     } catch (css::ucb::CommandAbortedException const &) {
@@ -207,10 +207,10 @@ bool utl::UCBContentHelper::GetTitle(
     }
 }
 
-bool utl::UCBContentHelper::Kill(rtl::OUString const & url) {
+bool utl::UCBContentHelper::Kill(OUString const & url) {
     try {
         content(url).executeCommand(
-            rtl::OUString("delete"),
+            OUString("delete"),
             css::uno::makeAny(true));
         return true;
     } catch (css::uno::RuntimeException const &) {
@@ -230,7 +230,7 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) {
 }
 
 bool utl::UCBContentHelper::MakeFolder(
-    ucbhelper::Content & parent, rtl::OUString const & title,
+    ucbhelper::Content & parent, OUString const & title,
     ucbhelper::Content & result, bool exclusive)
 {
     bool exists = false;
@@ -248,8 +248,8 @@ bool utl::UCBContentHelper::MakeFolder(
                 {
                     continue;
                 }
-                css::uno::Sequence<rtl::OUString> keys(1);
-                keys[0] = rtl::OUString("Title");
+                css::uno::Sequence<OUString> keys(1);
+                keys[0] = OUString("Title");
                 css::uno::Sequence<css::uno::Any> values(1);
                 values[0] <<= title;
                 if (parent.insertNewContent(info[i].Type, keys, values, result))
@@ -293,10 +293,10 @@ bool utl::UCBContentHelper::MakeFolder(
     }
 }
 
-sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
+sal_Int64 utl::UCBContentHelper::GetSize(OUString const & url) {
     try {
         sal_Int64 n = 0;
-        bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n);
+        bool ok = (content(url).getPropertyValue(OUString("Size")) >>= n);
         SAL_INFO_IF(
             !ok, "unotools.ucbhelper",
             "UCBContentHelper::GetSize(" << url
@@ -319,17 +319,17 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
 }
 
 bool utl::UCBContentHelper::IsYounger(
-    rtl::OUString const & younger, rtl::OUString const & older)
+    OUString const & younger, OUString const & older)
 {
     try {
         return
             convert(
                 content(younger).getPropertyValue(
-                    rtl::OUString("DateModified")).
+                    OUString("DateModified")).
                 get<css::util::DateTime>())
             > convert(
                 content(older).getPropertyValue(
-                    rtl::OUString("DateModified")).
+                    OUString("DateModified")).
                 get<css::util::DateTime>());
     } catch (css::uno::RuntimeException const &) {
         throw;
@@ -347,11 +347,11 @@ bool utl::UCBContentHelper::IsYounger(
     }
 }
 
-bool utl::UCBContentHelper::Exists(rtl::OUString const & url) {
-    rtl::OUString pathname;
+bool utl::UCBContentHelper::Exists(OUString const & url) {
+    OUString pathname;
     if (utl::LocalFileHelper::ConvertURLToPhysicalName(url, pathname)) {
         // Try to create a directory entry for the given URL:
-        rtl::OUString url2;
+        OUString url2;
         if (osl::FileBase::getFileURLFromSystemPath(pathname, url2)
             == osl::FileBase::E_None)
         {
@@ -365,15 +365,15 @@ bool utl::UCBContentHelper::Exists(rtl::OUString const & url) {
     } else {
         // Divide URL into folder and name part:
         INetURLObject o(url);
-        rtl::OUString name(
+        OUString name(
             o.getName(
                 INetURLObject::LAST_SEGMENT, true,
                 INetURLObject::DECODE_WITH_CHARSET));
         o.removeSegment();
         o.removeFinalSlash();
-        std::vector<rtl::OUString> cs(
+        std::vector<OUString> cs(
             getContents(o.GetMainURL(INetURLObject::NO_DECODE)));
-        for (std::vector<rtl::OUString>::iterator i(cs.begin()); i != cs.end();
+        for (std::vector<OUString>::iterator i(cs.begin()); i != cs.end();
              ++i)
         {
             if (INetURLObject(*i).getName(
@@ -389,7 +389,7 @@ bool utl::UCBContentHelper::Exists(rtl::OUString const & url) {
 }
 
 bool utl::UCBContentHelper::IsSubPath(
-    rtl::OUString const & parent, rtl::OUString const & child)
+    OUString const & parent, OUString const & child)
 {
     // The comparison is done in the following way:
     // - First, compare case sensitively
@@ -438,7 +438,7 @@ bool utl::UCBContentHelper::IsSubPath(
 }
 
 bool utl::UCBContentHelper::EqualURLs(
-    rtl::OUString const & url1, rtl::OUString const & url2)
+    OUString const & url1, OUString const & url2)
 {
     if (url1.isEmpty() || url2.isEmpty()) {
         return false;
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 086ee702582a..a5ff6fcad3f0 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -186,7 +186,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
     for (i = 0; i < n; i++)
     {
         PropertyChangeEvent evt (rEvent[i]);
-        if (evt.PropertyName == ::rtl::OUString("DocumentHeader"))
+        if (evt.PropertyName == OUString("DocumentHeader"))
         {
             Sequence<DocumentHeaderField> aHead;
             if (evt.NewValue >>= aHead)
@@ -211,12 +211,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
 
             m_xLockBytes->SetStreamValid_Impl();
         }
-        else if (evt.PropertyName == rtl::OUString("PresentationURL"))
+        else if (evt.PropertyName == OUString("PresentationURL"))
         {
-            ::rtl::OUString aUrl;
+            OUString aUrl;
             if (evt.NewValue >>= aUrl)
             {
-                ::rtl::OUString aBad ("private:");
+                OUString aBad ("private:");
                 if (!aUrl.startsWith(aBad))
                 {
                     // URL changed (Redirection).
@@ -224,9 +224,9 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
                 }
             }
         }
-        else if (evt.PropertyName == ::rtl::OUString("MediaType"))
+        else if (evt.PropertyName == OUString("MediaType"))
         {
-            ::rtl::OUString aContentType;
+            OUString aContentType;
             if (evt.NewValue >>= aContentType)
                 m_xLockBytes->SetContentType_Impl( aContentType );
         }
@@ -905,7 +905,7 @@ static sal_Bool UCBOpenContentSync(
     Reference<XContentIdentifier> xContId(
         xContent.is() ? xContent->getIdentifier() : 0 );
 
-    rtl::OUString aScheme;
+    OUString aScheme;
     if(xContId.is())
         aScheme = xContId->getContentProviderScheme();
 
@@ -927,7 +927,7 @@ static sal_Bool UCBOpenContentSync(
         xListener =
             new UcbPropertiesChangeListener_Impl(xLockBytes);
         xProps->addPropertiesChangeListener(
-            Sequence< ::rtl::OUString >(),
+            Sequence< OUString >(),
             xListener);
     }
 
@@ -1012,11 +1012,11 @@ static sal_Bool UCBOpenContentSync(
                     INetURLObject aURL(
                         xContId.is() ?
                         xContId->getContentIdentifier() :
-                        rtl::OUString() );
+                        OUString() );
                     aExcep.Server = aURL.GetHost();
                     aExcep.Classification = InteractionClassification_ERROR;
                     aExcep.Message =
-                        rtl::OUString( "server not responding after five seconds");
+                        OUString( "server not responding after five seconds");
                     Any request;
                     request <<= aExcep;
                     ucbhelper::InteractionRequest *ir =
@@ -1128,7 +1128,7 @@ static sal_Bool UCBOpenContentSync(
 
     if ( xProps.is() )
         xProps->removePropertiesChangeListener(
-            Sequence< ::rtl::OUString >(),
+            Sequence< OUString >(),
             xListener );
 
     return ( bAborted || bException );
@@ -1150,7 +1150,7 @@ static sal_Bool _UCBOpenContentSync(
         xContent, new UcbTaskEnvironment( xInteract, xProgress ),
         comphelper::getProcessComponentContext() );
     Reference < XContentIdentifier > xIdent = xContent->getIdentifier();
-    ::rtl::OUString aScheme = xIdent->getContentProviderScheme();
+    OUString aScheme = xIdent->getContentProviderScheme();
 
     // http protocol must be handled in a special way: during the opening process the input stream may change
     // only the last inputstream after notifying the document headers is valid
@@ -1160,7 +1160,7 @@ static sal_Bool _UCBOpenContentSync(
     Reference< XPropertiesChangeListener > xListener = new UcbPropertiesChangeListener_Impl( xLockBytes );
     Reference< XPropertiesChangeNotifier > xProps ( xContent, UNO_QUERY );
     if ( xProps.is() )
-        xProps->addPropertiesChangeListener( Sequence< ::rtl::OUString >(), xListener );
+        xProps->addPropertiesChangeListener( Sequence< OUString >(), xListener );
 
     Any aResult;
     bool bException = false;
@@ -1223,7 +1223,7 @@ static sal_Bool _UCBOpenContentSync(
 
 
     if ( xProps.is() )
-        xProps->removePropertiesChangeListener( Sequence< ::rtl::OUString >(), xListener );
+        xProps->removePropertiesChangeListener( Sequence< OUString >(), xListener );
 
     return ( bAborted || bException );
 }
@@ -1621,7 +1621,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
     {
         Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY );
         Command aCommand;
-        aCommand.Name     = ::rtl::OUString("setPropertyValues");
+        aCommand.Name     = OUString("setPropertyValues");
         aCommand.Handle   = -1; /* unknown */
         aCommand.Argument <<= rProps;
         xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() );
@@ -1632,7 +1632,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
     aArgument.Mode = OpenMode::DOCUMENT;
 
     Command aCommand;
-    aCommand.Name = ::rtl::OUString( "open" );
+    aCommand.Name = OUString( "open" );
     aCommand.Argument <<= aArgument;
 
     Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) );
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index bcad77d79020..1c9e39dc9658 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode
                 ::ucbhelper::Content aCnt(
                     rFileName, Reference < XCommandEnvironment >(),
                     comphelper::getProcessComponentContext() );
-                aCnt.executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
+                aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
             }
 
             catch ( const CommandAbortedException& )
@@ -93,7 +93,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode
                 aInsertArg.ReplaceExisting = sal_False;
                 Any aCmdArg;
                 aCmdArg <<= aInsertArg;
-                aContent.executeCommand( ::rtl::OUString("insert"), aCmdArg );
+                aContent.executeCommand( OUString("insert"), aCmdArg );
             }
 
             // it is NOT an error when the stream already exists and no truncation was desired
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index b88949da771e..56405bbb4c99 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -27,7 +27,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont
 : ::cppu::PropertySetMixin< css::io::XTempFile >(
     context
     , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS )
-    , com::sun::star::uno::Sequence< rtl::OUString >() )
+    , com::sun::star::uno::Sequence< OUString >() )
 , mpStream( NULL )
 , mbRemoveFile( sal_True )
 , mbInClosed( sal_False )
@@ -123,7 +123,7 @@ throw ( css::uno::RuntimeException )
     mbRemoveFile = _removefile;
     mpTempFile->EnableKillingFile( mbRemoveFile );
 };
-::rtl::OUString SAL_CALL OTempFileService::getUri()
+OUString SAL_CALL OTempFileService::getUri()
 throw ( css::uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -133,10 +133,10 @@ throw ( css::uno::RuntimeException )
         throw css::uno::RuntimeException();
     }
 
-    return ::rtl::OUString( mpTempFile->GetURL() );
+    return OUString( mpTempFile->GetURL() );
 
 };
-::rtl::OUString SAL_CALL OTempFileService::getResourceName()
+OUString SAL_CALL OTempFileService::getResourceName()
 throw ( css::uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -146,7 +146,7 @@ throw ( css::uno::RuntimeException )
         throw css::uno::RuntimeException();
 }
 
-    return ::rtl::OUString( mpTempFile->GetFileName() );
+    return OUString( mpTempFile->GetFileName() );
 };
 
 
@@ -158,11 +158,11 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     checkConnected();
     if (nBytesToRead < 0)
-        throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast< css::uno::XWeak * >(this));
+        throw css::io::BufferSizeExceededException( OUString(), static_cast< css::uno::XWeak * >(this));
 
     aData.realloc(nBytesToRead);
 
@@ -191,13 +191,13 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     checkConnected();
     checkError();
 
     if (nMaxBytesToRead < 0)
-        throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast < css::uno::XWeak * >( this ) );
+        throw css::io::BufferSizeExceededException( OUString(), static_cast < css::uno::XWeak * >( this ) );
 
     if (mpStream->IsEof())
     {
@@ -212,7 +212,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     checkConnected();
     checkError();
@@ -224,7 +224,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     checkConnected();
 
@@ -245,7 +245,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak  * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak  * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     mbInClosed = sal_True;
 
@@ -269,20 +269,20 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     checkConnected();
     sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength());
     checkError();
     if  ( nWritten != (sal_uInt32)aData.getLength())
-        throw css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < css::uno::XWeak * > ( this ) );
+        throw css::io::BufferSizeExceededException( OUString(),static_cast < css::uno::XWeak * > ( this ) );
 }
 void SAL_CALL OTempFileService::flush(  )
 throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     checkConnected();
     mpStream->Flush();
@@ -293,7 +293,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 
     mbOutClosed = sal_True;
 
@@ -325,7 +325,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
 void OTempFileService::checkError () const
 {
     if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE )
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 }
 void OTempFileService::checkConnected ()
 {
@@ -349,7 +349,7 @@ void OTempFileService::checkConnected ()
     }
 
     if (!mpStream)
-        throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
+        throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) );
 }
 
 // XSeekable
@@ -423,20 +423,20 @@ throw ( css::io::IOException, css::uno::RuntimeException )
 
 // XServiceInfo
 
-::rtl::OUString SAL_CALL OTempFileService::getImplementationName()
+OUString SAL_CALL OTempFileService::getImplementationName()
 throw ( css::uno::RuntimeException )
 {
     return getImplementationName_Static();
 }
 
-sal_Bool SAL_CALL OTempFileService::supportsService( ::rtl::OUString const & rServiceName )
+sal_Bool SAL_CALL OTempFileService::supportsService( OUString const & rServiceName )
 throw ( css::uno::RuntimeException )
 {
-    css::uno::Sequence< ::rtl::OUString > aServices(getSupportedServiceNames_Static());
+    css::uno::Sequence< OUString > aServices(getSupportedServiceNames_Static());
     return rServiceName == aServices[0];
 }
 
-css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames()
+css::uno::Sequence < OUString > SAL_CALL OTempFileService::getSupportedServiceNames()
 throw ( css::uno::RuntimeException )
 {
     return getSupportedServiceNames_Static();
@@ -444,13 +444,13 @@ throw ( css::uno::RuntimeException )
 
 
 
-::rtl::OUString OTempFileService::getImplementationName_Static ()
+OUString OTempFileService::getImplementationName_Static ()
 {
-    return ::rtl::OUString ( "com.sun.star.io.comp.TempFile" );
+    return OUString ( "com.sun.star.io.comp.TempFile" );
 }
-css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static()
+css::uno::Sequence < OUString > OTempFileService::getSupportedServiceNames_Static()
 {
-    css::uno::Sequence < ::rtl::OUString > aNames ( 1 );
+    css::uno::Sequence < OUString > aNames ( 1 );
     aNames[0] = "com.sun.star.io.TempFile";
     return aNames;
 }