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

14 files changed, 132 insertions, 132 deletions

diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 23a721742b63..35e625d53898 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -58,7 +58,7 @@ static ::osl::Mutex m_aMetaMutex;
 
 
 #if OSL_DEBUG_LEVEL > 0
-# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
+# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
 #else /* OSL_DEBUG_LEVEL */
 # define OUtoCStr( x ) ("dummy")
 #endif /* OSL_DEBUG_LEVEL */
@@ -108,7 +108,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()
         Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
         OSL_ENSURE( xFactory.is(), "can't get service factory" );
 
-        Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+        Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
         xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
         m_bProfileExists = xMozillaBootstrap->shutdownProfile() > 0;
@@ -200,7 +200,7 @@ static nsresult insertPABDescription()
 
 // -------------------------------------------------------------------------
 // Case where we get a parent uri, and need to list its children.
-static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **aSubs)
+static nsresult getSubsFromParent(const OString& aParent, nsIEnumerator **aSubs)
 {
 
     if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; }
@@ -218,7 +218,7 @@ static nsresult getSubsFromParent(const rtl::OString& aParent, nsIEnumerator **a
 
     nsCOMPtr<nsIRDFDataSource> rdfDirectory ;
 
-    rtl::OString dir("rdf:addressdirectory");
+    OString dir("rdf:addressdirectory");
     retCode = rdfService->GetDataSource(dir.getStr(),getter_AddRefs(rdfDirectory)) ;
 
 
@@ -267,7 +267,7 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array)
 }
 
 // Case where we get a factory uri and need to have it build the directories.
-static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator **aSubs)
+static nsresult getSubsFromFactory(const OString& aFactory, nsIEnumerator **aSubs)
 {
     if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; }
     *aSubs = nsnull ;
@@ -299,7 +299,7 @@ static nsresult getSubsFromFactory(const rtl::OString& aFactory, nsIEnumerator *
 }
 
 // Case where the uri itself is the directory we're looking for.
-static nsresult getSubsFromURI(const rtl::OString& aUri, nsIEnumerator **aSubs)
+static nsresult getSubsFromURI(const OString& aUri, nsIEnumerator **aSubs)
 {
     if (aSubs == nsnull) { return NS_ERROR_NULL_POINTER ; }
     *aSubs = nsnull ;
@@ -370,8 +370,8 @@ namespace
 }
 
 nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap,
-                        ::std::vector< ::rtl::OUString >*   _rStrings,
-                        ::std::vector< ::rtl::OUString >*   _rTypes,
+                        ::std::vector< OUString >*   _rStrings,
+                        ::std::vector< OUString >*   _rTypes,
                         sal_Int32* pErrorId )
 {
     if (!sAbURI || !nmap || !_rStrings || !_rTypes || !pErrorId)
@@ -408,7 +408,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
     PRUnichar              *name = nsnull;
     PRBool                  bIsMailList = PR_FALSE;
 
-    ::rtl::OUString aTableName;
+    OUString aTableName;
     nsCOMPtr<nsIRDFService> rdfService(do_GetService(kRDFServiceCID, &rv)) ;
     NS_ENSURE_SUCCESS(rv, rv) ;
 
@@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
 
         // Insert table into map
         if ( aTableName.isEmpty() )
-            aTableName = rtl::OUString("AddressBook");
+            aTableName = OUString("AddressBook");
 
         OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
 
@@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
             //map mailing lists as views
             _rStrings->push_back( aTableName ); // Table name
             if (!bIsMailList) {
-                ::rtl::OUString aTableType(::rtl::OUString("TABLE"));
+                OUString aTableType(OUString("TABLE"));
                 _rTypes->push_back( aTableType ); // Table type
             }
             else
             {
-                ::rtl::OUString aTableType(::rtl::OUString("VIEW"));
+                OUString aTableType(OUString("VIEW"));
                 _rTypes->push_back( aTableType ); // Table type
             }
         }
@@ -469,12 +469,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
     return( NS_OK );
 }
 sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*                        _pCon,
-                                                   ::std::vector< ::rtl::OUString >&   _rStrings,
-                                                   ::std::vector< ::rtl::OUString >&   _rTypes)
+                                                   ::std::vector< OUString >&   _rStrings,
+                                                   ::std::vector< OUString >&   _rTypes)
 {
     sal_Bool                                    bGivenURI;
-    ::rtl::OUString                             sAbURI;
-    ::rtl::OString                                      sAbURIString;
+    OUString                             sAbURI;
+    OString                                      sAbURIString;
 
     OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)", _pCon, _pCon->getForceLoadTables()?"True":"False" );
 
@@ -495,7 +495,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
     if ( sAbURI.isEmpty() )
         bGivenURI = sal_False;
     else {
-        sAbURIString = ::rtl::OUStringToOString( sAbURI,
+        sAbURIString = OUStringToOString( sAbURI,
                                                  RTL_TEXTENCODING_ASCII_US);
         bGivenURI = sal_True;
     }
@@ -550,7 +550,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
         Reference<XMozillaBootstrap> xMozillaBootstrap;
         Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
         OSL_ENSURE( xFactory.is(), "can't get service factory" );
-         Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+         Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
         xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY);
         m_bProfileExists = sal_False;
@@ -609,8 +609,8 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection*
 }
 
 sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
-                                             const ::rtl::OUString& tableNamePattern,
-                                             const Sequence< ::rtl::OUString >& types,
+                                             const OUString& tableNamePattern,
+                                             const Sequence< OUString >& types,
                                              ODatabaseMetaDataResultSet::ORows& _rRows)
 {
 
@@ -622,9 +622,9 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
     ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well
     aRows.clear();
 
-    ::std::vector< ::rtl::OUString > tables;
-    ::std::vector< ::rtl::OUString > tabletypes;
-    ::rtl::OUString matchAny = rtl::OUString("%");
+    ::std::vector< OUString > tables;
+    ::std::vector< OUString > tabletypes;
+    OUString matchAny = OUString("%");
 
     if ( !getTableStrings( _pCon, tables,tabletypes ) )
         return sal_False;
@@ -632,8 +632,8 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
     for ( size_t i = 0; i < tables.size(); i++ ) {
         ODatabaseMetaDataResultSet::ORow aRow(3);
 
-        ::rtl::OUString aTableName  = tables[i];
-        ::rtl::OUString aTableType      = tabletypes[i];
+        OUString aTableName  = tables[i];
+        OUString aTableType      = tabletypes[i];
         OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
 
 
@@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
                        0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() ||
                        0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) {
             if ( aTableName.isEmpty() ) {
-                aTableName = rtl::OUString("AddressBook");
+                aTableName = OUString("AddressBook");
             }
 
             OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) );
@@ -668,9 +668,9 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
     const sal_Char*   MOZ_SCHEMA = "moz-abldapdirectory://";
     const sal_Char*   LDAP_SCHEMA = "ldap://";
 
-    rtl::OString   sAbURI;
-    rtl::OUString   sAbBindDN;
-    rtl::OUString   sAbPassword;
+    OString   sAbURI;
+    OUString   sAbBindDN;
+    OUString   sAbPassword;
     sal_Bool      useSSL    = _pCon->getUseSSL();
 
     nsresult       rv(0);
@@ -682,13 +682,13 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
 
     sal_Int32 pos = sAbURI.indexOf( MOZ_SCHEMA );
     if ( pos != -1 ) {
-        sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), ::rtl::OString(LDAP_SCHEMA) );
+        sAbURI = sAbURI.replaceAt (pos, rtl_str_getLength( MOZ_SCHEMA ), OString(LDAP_SCHEMA) );
     }
 
     pos = sAbURI.indexOf( QUERY_CHAR );
     if ( pos != -1 ) {
         sal_Int32 len =  sAbURI.getLength();
-        sAbURI = sAbURI.replaceAt( pos, len - pos, ::rtl::OString("") );
+        sAbURI = sAbURI.replaceAt( pos, len - pos, OString("") );
     }
     const sal_Unicode* bindDN=nsnull;
     if (!sAbBindDN.isEmpty())
@@ -705,7 +705,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
     args.arg4 = (void*)&useSSL;
 
     MNSMozabProxy xMProxy;
-    rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() );
+    rv = xMProxy.StartProxy( &args, m_ProductType, OUString() );
     if ( NS_SUCCEEDED( rv ) )   //Init LDAP,pass OUString() to StarProxy to ignore profile switch
     {
         args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED;
@@ -713,7 +713,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
         sal_Int32               times=0;
         while ( times++ < 30 )
         {
-            rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() );
+            rv = xMProxy.StartProxy( &args, m_ProductType, OUString() );
             if ( NS_SUCCEEDED( rv ) )
                 // connected successfully
                 break;
@@ -730,7 +730,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon )
     return NS_SUCCEEDED( rv ) ? sal_True : sal_False;
 }
 
-sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName)
+sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const OUString & aTableName)
 {
     sal_Bool                                    bIsMozillaAB;
 
@@ -759,19 +759,19 @@ sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl:
     }
     else if (NS_FAILED(rv))
     {
-        m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, ::rtl::OUString::valueOf( sal_Int32(rv), 16 ) );
+        m_aError.set( STR_COULD_NOT_CREATE_ADDRESSBOOK, 0, OUString::valueOf( sal_Int32(rv), 16 ) );
     }
     OSL_TRACE( "OUT MDatabaseMetaDataHelper::NewAddressBook()" );
     return( NS_SUCCEEDED(rv) ? sal_True : sal_False );
 }
-nsresult NewAddressBook(const ::rtl::OUString * aName)
+nsresult NewAddressBook(const OUString * aName)
 {
     if (isProfileLocked(NULL))
         return NS_ERROR_FILE_IS_LOCKED;
     nsresult rv;
     nsCOMPtr<nsIAbDirectoryProperties> aProperties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &rv);
     NS_ENSURE_ARG_POINTER(aProperties);
-    const ::rtl::OUString& uName = *aName;
+    const OUString& uName = *aName;
     nsString nsName;
     MTypeConverter::ouStringToNsString(uName,nsName);
     aProperties->SetDescription(nsName);
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 284ee9ab1694..4aa86de5bf92 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
@@ -37,10 +37,10 @@ namespace connectivity
         {
         private:
             sal_Bool                                        m_bProfileExists ;
-            ::std::vector< ::rtl::OUString >                m_aTableNames;
-            ::std::vector< ::rtl::OUString >                m_aTableTypes;
+            ::std::vector< OUString >                m_aTableNames;
+            ::std::vector< OUString >                m_aTableTypes;
             ::com::sun::star::mozilla::MozillaProductType   m_ProductType;
-            ::rtl::OUString                                 m_ProfileName;
+            OUString                                 m_ProfileName;
             ErrorDescriptor                                 m_aError;
 
         public:
@@ -49,15 +49,15 @@ namespace connectivity
 
             //
             sal_Bool getTableStrings( OConnection*                        _pCon,
-                                      ::std::vector< ::rtl::OUString >&   _rStrings,
-                                      ::std::vector< ::rtl::OUString >&   _rTypes);
+                                      ::std::vector< OUString >&   _rStrings,
+                                      ::std::vector< OUString >&   _rTypes);
 
             sal_Bool getTables( OConnection* _pCon,
-                                const ::rtl::OUString& tableNamePattern,
-                                const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types,
+                                const OUString& tableNamePattern,
+                                const ::com::sun::star::uno::Sequence< OUString >& types,
                                 ODatabaseMetaDataResultSet::ORows& _rRows);
             sal_Bool   testLDAPConnection( OConnection* _pCon );
-            sal_Bool   NewAddressBook( OConnection* _pCon,const ::rtl::OUString & aTableName);
+            sal_Bool   NewAddressBook( OConnection* _pCon,const OUString & aTableName);
 
             inline const ErrorDescriptor& getError() const { return m_aError; }
         };
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
index c7739c935c6b..61ec08337514 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
@@ -31,7 +31,7 @@ namespace connectivity
         private:
             sal_uInt16      m_nErrorResourceId;
             sal_Int32       m_nErrorCondition;
-            ::rtl::OUString m_sParameter;
+            OUString m_sParameter;
 
         public:
             ErrorDescriptor()
@@ -41,7 +41,7 @@ namespace connectivity
             {
             }
 
-            inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const ::rtl::OUString& _rParam )
+            inline void set( const sal_uInt16 _nErrorResourceId, const sal_Int32 _nErrorCondition, const OUString& _rParam )
             {
                 m_nErrorResourceId = _nErrorResourceId;
                 m_nErrorCondition = _nErrorCondition;
@@ -59,7 +59,7 @@ namespace connectivity
 
             inline sal_uInt16 getResId() const                  { return m_nErrorResourceId; }
             inline sal_Int32  getErrorCondition() const         { return m_nErrorCondition; }
-            inline const ::rtl::OUString& getParameter() const  { return m_sParameter; }
+            inline const OUString& getParameter() const  { return m_sParameter; }
 
             inline bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); }
         };
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index fd5e15c51551..add19e6852ba 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -62,7 +62,7 @@ namespace connectivity { namespace mozab {
             }
         };
 
-        typedef ::boost::unordered_map< ::rtl::OString, CardPropertyData, ::rtl::OStringHash > MapPropertiesToAttributes;
+        typedef ::boost::unordered_map< OString, CardPropertyData, OStringHash > MapPropertiesToAttributes;
 
         #define DEF_CARD_ACCESS( PropertyName ) \
             &nsIAbCard::Get##PropertyName, &nsIAbCard::Set##PropertyName
@@ -122,7 +122,7 @@ namespace connectivity { namespace mozab {
                 const MapEntry* loop = aEntries;
                 while ( loop->pAsciiPropertyName )
                 {
-                    aMap[ ::rtl::OString( loop->pAsciiPropertyName ) ] =
+                    aMap[ OString( loop->pAsciiPropertyName ) ] =
                         CardPropertyData( loop->pAsciiAttrributeList, loop->PropGetter, loop->PropSetter );
                     ++loop;
                 }
@@ -158,7 +158,7 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval)
     {
-        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
+        OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
 
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );
@@ -188,7 +188,7 @@ namespace connectivity { namespace mozab {
     // -------------------------------------------------------------------
     NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval)
     {
-        ::rtl::OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
+        OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
 
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         MapPropertiesToAttributes::const_iterator pos = rPropertyMap.find( sProperty );
@@ -200,7 +200,7 @@ namespace connectivity { namespace mozab {
         else
         {
             sal_Int32 tokenPos(0);
-            ::rtl::OString sAttributeList( pos->second.pLDAPAttributeList );
+            OString sAttributeList( pos->second.pLDAPAttributeList );
             MTypeConverter::asciiToNsACString( sAttributeList.getToken( 0, ',', tokenPos ).getStr(), _retval );
         }
 
@@ -231,7 +231,7 @@ namespace connectivity { namespace mozab {
     {
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
 
-        ::rtl::OStringBuffer aAllAttributes;
+        OStringBuffer aAllAttributes;
         for (   MapPropertiesToAttributes::const_iterator loop = rPropertyMap.begin();
                 loop != rPropertyMap.end();
                 ++loop
@@ -277,8 +277,8 @@ namespace connectivity { namespace mozab {
             )
         {
             // split the list of attributes for the current property
-            ::rtl::OString sAttributeList( prop->second.pLDAPAttributeList );
-            ::rtl::OString sAttribute;
+            OString sAttributeList( prop->second.pLDAPAttributeList );
+            OString sAttribute;
 
             sal_Int32 tokenPos = 0;
             while ( tokenPos != -1 )
@@ -352,7 +352,7 @@ namespace connectivity { namespace mozab {
     {
         _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown );
 
-        ::rtl::OUString resultValue;
+        OUString resultValue;
 
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         for (   MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin();
@@ -395,7 +395,7 @@ namespace connectivity { namespace mozab {
     void MLdapAttributeMap::fillResultFromCard( MQueryHelperResultEntry& _result, nsIAbCard& _card )
     {
         nsXPIDLString value;
-        ::rtl::OUString resultValue;
+        OUString resultValue;
 
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
         for (   MapPropertiesToAttributes::const_iterator prop = rPropertyMap.begin();
@@ -422,7 +422,7 @@ namespace connectivity { namespace mozab {
                     {
                         if ( format == pMailFormatType->formatType )
                         {
-                            resultValue = ::rtl::OUString::createFromAscii( pMailFormatType->description );
+                            resultValue = OUString::createFromAscii( pMailFormatType->description );
                             break;
                         }
                         ++pMailFormatType;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 305b0da6ccf3..b086571a2e1b 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -53,7 +53,7 @@ using namespace connectivity::mozab;
 /* Implementation file */
 
 static ::osl::Mutex m_aThreadMutex;
-extern nsresult NewAddressBook(const ::rtl::OUString * aName);
+extern nsresult NewAddressBook(const OUString * aName);
 
 
 MNSMozabProxy::MNSMozabProxy()
@@ -69,7 +69,7 @@ MNSMozabProxy::~MNSMozabProxy()
 {
 }
 
-sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile)
+sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const OUString &aProfile)
 {
     OSL_TRACE( "IN : MNSMozabProxy::StartProxy()" );
     ::osl::MutexGuard aGuard(m_aThreadMutex);
@@ -80,7 +80,7 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo
     {
         Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
         OSL_ENSURE( xFactory.is(), "can't get service factory" );
-        ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+        ::com::sun::star::uno::Reference<XInterface> xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
         OSL_ENSURE( xInstance.is(), "failed to create instance" );
         xRunner = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner >(xInstance,UNO_QUERY);
     }
@@ -89,15 +89,15 @@ sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::Mo
 }
 
 extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap,
-                        ::std::vector< ::rtl::OUString >*   _rStrings,
-                        ::std::vector< ::rtl::OUString >*   _rTypes,
+                        ::std::vector< OUString >*   _rStrings,
+                        ::std::vector< OUString >*   _rTypes,
                         sal_Int32* pErrorId );
 
 ::com::sun::star::mozilla::MozillaProductType SAL_CALL MNSMozabProxy::getProductType(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_Product;
 }
-::rtl::OUString SAL_CALL MNSMozabProxy::getProfileName(  ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL MNSMozabProxy::getProfileName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_Profile;
 }
@@ -123,8 +123,8 @@ sal_Int32 SAL_CALL MNSMozabProxy::run(  ) throw (::com::sun::star::uno::RuntimeE
         rv = getTableStringsProxied((const sal_Char*)m_Args->arg1,
                                 (sal_Int32 *)m_Args->arg2,
                                 (MNameMapper *)m_Args->arg3,
-                                (::std::vector< ::rtl::OUString >*)m_Args->arg4,
-                                (::std::vector< ::rtl::OUString >*)m_Args->arg5,
+                                (::std::vector< OUString >*)m_Args->arg4,
+                                (::std::vector< OUString >*)m_Args->arg5,
                                 (sal_Int32 *)m_Args->arg6);
         break;
     case ProxiedFunc::FUNC_EXECUTE_QUERY:
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL MNSMozabProxy::run(  ) throw (::com::sun::star::uno::RuntimeE
     case ProxiedFunc::FUNC_NEW_ADDRESS_BOOK:
         if (m_Args->arg1)
         {
-            rv = NewAddressBook((const ::rtl::OUString*)m_Args->arg1 );
+            rv = NewAddressBook((const OUString*)m_Args->arg1 );
         }
         break;
     default:
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index 2683b157c852..4e8c0241621c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
@@ -81,10 +81,10 @@ namespace connectivity
             //XCodeProxy
             virtual sal_Int32 SAL_CALL run(  ) throw (::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getProductType(  ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getProfileName(  ) throw (::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getProfileName(  ) throw (::com::sun::star::uno::RuntimeException);
 
         public:
-            sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile); //Call this to start proxy
+            sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const OUString &aProfile); //Call this to start proxy
 
         protected:
             nsresult testLDAPConnection();
@@ -95,7 +95,7 @@ namespace connectivity
 
             RunArgs * m_Args;
             ::com::sun::star::mozilla::MozillaProductType m_Product;
-            ::rtl::OUString m_Profile;
+            OUString m_Profile;
 #if OSL_DEBUG_LEVEL > 0
             oslThreadIdentifier m_oThreadID;
 #endif
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index 2a568130606d..f10b41f5c5ca 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
@@ -20,7 +20,7 @@
 #include <MNameMapper.hxx>
 
 #if OSL_DEBUG_LEVEL > 0
-# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
+# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
 #else /* OSL_DEBUG_LEVEL */
 # define OUtoCStr( x ) ("dummy")
 #endif /* OSL_DEBUG_LEVEL */
@@ -29,7 +29,7 @@
 using namespace connectivity::mozab;
 
 bool
-MNameMapper::ltstr::operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const
+MNameMapper::ltstr::operator()( const OUString &s1, const OUString &s2) const
 {
     return s1.compareTo(s2) < 0;
 }
@@ -76,7 +76,7 @@ const char * getURI(const nsIAbDirectory*  directory)
 
 // May modify the name passed in so that it's unique
 nsresult
-MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook )
+MNameMapper::add( OUString& str, nsIAbDirectory* abook )
 {
     MNameMapper::dirMap::iterator   iter;
 
@@ -87,18 +87,18 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook )
         return NS_ERROR_NULL_POINTER;
     }
 
-    ::rtl::OUString ouUri=::rtl::OUString::createFromAscii(getURI(abook));
+    OUString ouUri=OUString::createFromAscii(getURI(abook));
     if ( mUriMap->find (ouUri) != mUriMap->end() ) //There's already an entry with same uri
     {
         return NS_ERROR_FILE_NOT_FOUND;
     }
     mUriMap->insert( MNameMapper::uriMap::value_type( ouUri, abook ) );
 
-    ::rtl::OUString tempStr=str;
+    OUString tempStr=str;
     long count =1;
     while ( mDirMap->find( tempStr ) != mDirMap->end() ) {
 
-        tempStr = str + ::rtl::OUString::valueOf(count);
+        tempStr = str + OUString::valueOf(count);
         count ++;
     }
     str = tempStr;
@@ -109,7 +109,7 @@ MNameMapper::add( ::rtl::OUString& str, nsIAbDirectory* abook )
 }
 
 bool
-MNameMapper::getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook )
+MNameMapper::getDir( const OUString& str, nsIAbDirectory* *abook )
 {
     MNameMapper::dirMap::iterator   iter;
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
index 25dd13e911d3..85aefb5f6079 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
@@ -38,12 +38,12 @@ namespace connectivity
 
                 struct ltstr
                 {
-                    bool operator()( const ::rtl::OUString &s1, const ::rtl::OUString &s2) const;
+                    bool operator()( const OUString &s1, const OUString &s2) const;
                 };
 
 
-                typedef ::std::multimap< ::rtl::OUString, nsIAbDirectory *, ltstr > dirMap;
-                typedef ::std::multimap< ::rtl::OUString, nsIAbDirectory *, ltstr > uriMap;
+                typedef ::std::multimap< OUString, nsIAbDirectory *, ltstr > dirMap;
+                typedef ::std::multimap< OUString, nsIAbDirectory *, ltstr > uriMap;
 
                 static MNameMapper    *instance;
                 dirMap                     *mDirMap;
@@ -59,13 +59,13 @@ namespace connectivity
                 ~MNameMapper();
 
                 // May modify the name passed in so that it's unique
-                nsresult add( ::rtl::OUString& str, nsIAbDirectory* abook );
+                nsresult add( OUString& str, nsIAbDirectory* abook );
 
                 //reset dirs
                 void reset();
 
                 // Get the directory corresponding to str
-                bool getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook );
+                bool getDir( const OUString& str, nsIAbDirectory* *abook );
 
         };
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 21bed90e07dc..4be34d8f9cba 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
 
 #if OSL_DEBUG_LEVEL > 0
-# define OUtoCStr( x ) ( ::rtl::OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
+# define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr())
 #else /* OSL_DEBUG_LEVEL */
 # define OUtoCStr( x ) ("dummy")
 #endif /* OSL_DEBUG_LEVEL */
@@ -113,7 +113,7 @@ void MQuery::construct()
     NS_IF_ADDREF( m_aQueryHelper);
 }
 // -------------------------------------------------------------------------
-void MQuery::setAddressbook(::rtl::OUString &ab)
+void MQuery::setAddressbook(OUString &ab)
 {
     OSL_TRACE("IN MQuery::setAddressbook()");
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -166,7 +166,7 @@ static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression*  _aExpr,
 
             // Set the 'name' property of the boolString.
             // Check if it's an alias first...
-            rtl::OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() );
+            OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() );
             boolString->SetName( strdup( attrName.getStr() ) );
             OSL_TRACE("Name = %s ;", attrName.getStr() );
             // Set the 'matchType' property of the boolString. Check for equal length.
@@ -256,9 +256,9 @@ sal_uInt32 MQuery::InsertLoginInfo(OConnection* _pCon)
 {
     nsresult rv;        // Store return values.
 
-    rtl::OUString nameAB    = _pCon->getHost().replace('.','_');
-    rtl::OUString bindDN    = _pCon->getBindDN();
-    rtl::OUString password  = _pCon->getPassword();
+    OUString nameAB    = _pCon->getHost().replace('.','_');
+    OUString bindDN    = _pCon->getBindDN();
+    OUString password  = _pCon->getPassword();
     sal_Bool      useSSL    = _pCon->getUseSSL();
 
     nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID, &rv);
@@ -301,7 +301,7 @@ sal_Bool isProfileLocked(OConnection* _pCon)
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
     OSL_ENSURE( xFactory.is(), "can't get service factory" );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(::rtl::OUString("com.sun.star.mozilla.MozillaBootstrap") );
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInstance = xFactory->createInstance(OUString("com.sun.star.mozilla.MozillaBootstrap") );
     OSL_ENSURE( xInstance.is(), "failed to create instance" );
     xMozillaBootstrap = ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XMozillaBootstrap >(xInstance,::com::sun::star::uno::UNO_QUERY);
     if (_pCon)
@@ -620,7 +620,7 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow )
 }
 // -------------------------------------------------------------------------
 sal_Bool
-MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) const
+MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const
 {
     MQueryHelperResultEntry*   xResEntry = m_aQueryHelper->getByIndex( nDBRow );
 
@@ -645,7 +645,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString&
 
 // -------------------------------------------------------------------------
 sal_Bool
-MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const rtl::OUString& aDBColumnName, sal_Int32 nType ) const
+MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const
 {
     MQueryHelperResultEntry*   xResEntry = m_aQueryHelper->getByIndex( nDBRow );
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index c6d38529f93f..b9de6e148eaf 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
@@ -73,15 +73,15 @@ namespace connectivity
 
         class MQueryExpressionString : public MQueryExpressionBase {
         protected:
-            ::rtl::OUString     m_aName;         // LHS
+            OUString     m_aName;         // LHS
             MQueryOp::cond_type m_aBooleanCondition;
-            ::rtl::OUString     m_aValue;        // RHS
+            OUString     m_aValue;        // RHS
 
         public:
 
-            MQueryExpressionString( ::rtl::OUString&    lhs,
+            MQueryExpressionString( OUString&    lhs,
                                     MQueryOp::cond_type cond,
-                                    ::rtl::OUString     rhs )
+                                    OUString     rhs )
                 : MQueryExpressionBase( MQueryExpressionBase::StringExpr )
                 , m_aName( lhs )
                 , m_aBooleanCondition( cond )
@@ -89,18 +89,18 @@ namespace connectivity
             {
             }
 
-            MQueryExpressionString( ::rtl::OUString&    lhs,
+            MQueryExpressionString( OUString&    lhs,
                                     MQueryOp::cond_type cond )
                 : MQueryExpressionBase( MQueryExpressionBase::StringExpr )
                 , m_aName( lhs )
                 , m_aBooleanCondition( cond )
-                , m_aValue( ::rtl::OUString() )
+                , m_aValue( OUString() )
             {
             }
 
-            const ::rtl::OUString&    getName() const { return m_aName; }
+            const OUString&    getName() const { return m_aName; }
             MQueryOp::cond_type getCond() const { return m_aBooleanCondition; }
-            const ::rtl::OUString&    getValue() const { return m_aValue; }
+            const OUString&    getValue() const { return m_aValue; }
         };
 
         class MQuery;
@@ -192,14 +192,14 @@ namespace connectivity
         private:
             MQueryDirectory                *m_aQueryDirectory;
             MQueryHelper                   *m_aQueryHelper;
-            ::rtl::OUString                 m_aAddressbook;
+            OUString                 m_aAddressbook;
             sal_Int32                       m_nMaxNrOfReturns;
             sal_Bool                        m_bQuerySubDirs;
             MQueryExpression                m_aExpr;
             const OColumnAlias&             m_rColumnAlias;
             ::com::sun::star::mozilla::MozillaProductType
                                             m_Product;
-            ::rtl::OUString                 m_Profile;
+            OUString                 m_Profile;
             ErrorDescriptor                 m_aError;
 
             void construct();
@@ -226,7 +226,7 @@ namespace connectivity
 
             sal_uInt32                      InsertLoginInfo(OConnection* _pCon);
 
-            void                            setAddressbook( ::rtl::OUString&);
+            void                            setAddressbook( OUString&);
 
             const OColumnAlias&             getColumnAlias() const { return m_rColumnAlias; }
 
@@ -241,11 +241,11 @@ namespace connectivity
             sal_Bool                        checkRowAvailable( sal_Int32 nDBRow );
             sal_Bool                        getRowValue( connectivity::ORowSetValue& rValue,
                                                          sal_Int32 nDBRow,
-                                                         const rtl::OUString& aDBColumnName,
+                                                         const OUString& aDBColumnName,
                                                          sal_Int32 nType ) const;
             sal_Bool                        setRowValue( connectivity::ORowSetValue& rValue,
                                                          sal_Int32 nDBRow,
-                                                         const rtl::OUString& aDBColumnName,
+                                                         const OUString& aDBColumnName,
                                                          sal_Int32 nType ) const;
             sal_Int32                       getRowStates(sal_Int32 nDBRow);
             sal_Bool                        setRowStates(sal_Int32 nDBRow,sal_Int32 aState);
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 588ec2f5fc06..71ff4f07fb9c 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -60,17 +60,17 @@ MQueryHelperResultEntry::getCard()
 {
     return m_Card;
 }
-void MQueryHelperResultEntry::insert( const rtl::OString &key, rtl::OUString &value )
+void MQueryHelperResultEntry::insert( const OString &key, OUString &value )
 {
     m_Fields[ key ] = value;
 }
 
-rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const
+OUString MQueryHelperResultEntry::getValue( const OString &key ) const
 {
     FieldMap::const_iterator iter = m_Fields.find( key );
     if ( iter == m_Fields.end() )
     {
-        return rtl::OUString();
+        return OUString();
     }
     else
     {
@@ -78,7 +78,7 @@ rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString &key ) const
     }
 }
 
-void MQueryHelperResultEntry::setValue( const rtl::OString &key, const rtl::OUString & rValue)
+void MQueryHelperResultEntry::setValue( const OString &key, const OUString & rValue)
 {
     m_Fields[ key ] = rValue;
 }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 3d8169659a1e..17bb8475aca7 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -38,7 +38,7 @@ namespace connectivity
         class MQueryHelperResultEntry
         {
         private:
-            typedef ::boost::unordered_map< ::rtl::OString, ::rtl::OUString, ::rtl::OStringHash >  FieldMap;
+            typedef ::boost::unordered_map< OString, OUString, OStringHash >  FieldMap;
 
             mutable ::osl::Mutex    m_aMutex;
             FieldMap                m_Fields;
@@ -49,9 +49,9 @@ namespace connectivity
             MQueryHelperResultEntry();
             ~MQueryHelperResultEntry();
 
-            void            insert( const rtl::OString &key, rtl::OUString &value );
-            rtl::OUString   getValue( const rtl::OString &key ) const;
-            void            setValue( const rtl::OString &key, const rtl::OUString & rValue);
+            void            insert( const OString &key, OUString &value );
+            OUString   getValue( const OString &key ) const;
+            void            setValue( const OString &key, const OUString & rValue);
 
             void setCard(nsIAbCard *card);
             nsIAbCard *getCard();
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 701e403b2d93..813d67b09179 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -25,10 +25,10 @@
 using namespace connectivity::mozab;
 
 // -------------------------------------------------------------------------
-void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &nss)
+void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss)
 {
-    // Convert to ::rtl::OString (utf-8 encoding).
-    ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_UTF8));
+    // Convert to OString (utf-8 encoding).
+    OString os(OUStringToOString(ous, RTL_TEXTENCODING_UTF8));
 
     const char *cs = os.getStr();
     PRUint32 csLen = os.getLength();
@@ -38,11 +38,11 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns
     nss = mozString; // temp.
 }
 // -------------------------------------------------------------------------
-::rtl::OString MTypeConverter::nsACStringToOString( const nsACString& _source )
+OString MTypeConverter::nsACStringToOString( const nsACString& _source )
 {
     const char* buffer = _source.BeginReading();
     const char* bufferEnd = _source.EndReading();
-    return ::rtl::OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
+    return OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
 }
 // -------------------------------------------------------------------------
 void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest )
@@ -51,7 +51,7 @@ void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString
     _dest.AppendASCII( _asciiString );
 }
 // -------------------------------------------------------------------------
-void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ous)
+void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous)
 {
     // Get clone of buffer.
     PRUnichar *uc = ToNewUnicode(nss);
@@ -59,24 +59,24 @@ void MTypeConverter::nsStringToOUString(nsString const &nss, ::rtl::OUString &ou
 
     // TODO check if this is ok.
     // PRUnichar != sal_Unicode in mingw
-    ::rtl::OUString _ous(reinterpret_cast_mingw_only<sal_Unicode *>(uc), nssLen);
+    OUString _ous(reinterpret_cast_mingw_only<sal_Unicode *>(uc), nssLen);
     ous = _ous;
 
     nsMemory::Free(uc);
 }
 // -------------------------------------------------------------------------
-void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, ::rtl::OUString &ous)
+void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous)
 {
     // TODO, specify length.
     // PRUnichar != sal_Unicode in mingw
-    ::rtl::OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru));
+    OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru));
     ous = _ous;
 }
 // -------------------------------------------------------------------------
-char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
+char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous)
 {
-    // Convert ::rtl::OUString to ::rtl::OString,
-    ::rtl::OString os(rtl::OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US));
+    // Convert OUString to OString,
+    OString os(OUStringToOString(ous, RTL_TEXTENCODING_ASCII_US));
 
     return(strdup(os.getStr()));
 }
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index 7ff358f82436..758983dddfd5 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
@@ -32,18 +32,18 @@ namespace connectivity
         class MTypeConverter
         {
         public:
-            static void  ouStringToNsString(const ::rtl::OUString&, nsString&);
-            static void  nsStringToOUString(const nsString&, ::rtl::OUString&);
-            static void  prUnicharToOUString(const PRUnichar*, ::rtl::OUString&);
+            static void  ouStringToNsString(const OUString&, nsString&);
+            static void  nsStringToOUString(const nsString&, OUString&);
+            static void  prUnicharToOUString(const PRUnichar*, OUString&);
             // Use free() for the following 3 calls.
-            static char *ouStringToCCharStringAscii(const ::rtl::OUString&);
+            static char *ouStringToCCharStringAscii(const OUString&);
             static char *nsStringToCCharStringAscii(const nsString&);
-            static char *ouStringToCCharStringUtf8(const ::rtl::OUString&);
+            static char *ouStringToCCharStringUtf8(const OUString&);
             // Convert to stl-string.
-            static ::std::string ouStringToStlString(const ::rtl::OUString&);
+            static ::std::string ouStringToStlString(const OUString&);
             static ::std::string nsStringToStlString(const nsString&);
 
-            static ::rtl::OString nsACStringToOString( const nsACString& _source );
+            static OString nsACStringToOString( const nsACString& _source );
             static void asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest );
 
         private: