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

11 files changed, 111 insertions, 115 deletions

diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 27d328a113cd..b91bb0e7e433 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -72,7 +72,7 @@ void MozillaBootstrap::Init()
     (void)aProfileExists; /* avoid warning about unused parameter */
 #endif
     m_ProfileAccess = new ProfileAccess();
-    bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString());
+    bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString());
 }
 
 // --------------------------------------------------------------------------------
@@ -84,32 +84,32 @@ void MozillaBootstrap::disposing()
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
+OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
+    return OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
 }
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
     // for more information @see com.sun.star.mozilla.MozillaBootstrap
-    Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap");
+    Sequence< OUString > aSNS( 1 );
+    aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap");
     return aSNS;
 }
 
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL MozillaBootstrap::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL MozillaBootstrap::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
 //------------------------------------------------------------------
-sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -117,7 +117,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rSe
 }
 
 //------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
@@ -128,29 +128,29 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 {
     return m_ProfileAccess->getProfileCount(product);
 }
-::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
+::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_ProfileAccess->getProfileList(product,list);
 }
-::rtl::OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_ProfileAccess->getDefaultProfile(product);
 }
-::rtl::OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_ProfileAccess->getProfilePath(product,profileName);
 }
-::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_ProfileAccess->isProfileLocked(product,profileName);
 }
-::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
     return m_ProfileAccess->getProfileExists(product,profileName);
 }
 
 // XProfileManager
-::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->bootupProfile(product,profileName);
@@ -176,12 +176,12 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
     return ::com::sun::star::mozilla::MozillaProductType_Default;
 #endif
 }
-::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->getCurrentProfile();
 #else
-    return ::rtl::OUString();
+    return OUString();
 #endif
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  ) throw (::com::sun::star::uno::RuntimeException)
@@ -192,14 +192,14 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
     return true;
 #endif
 }
-::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
 #ifndef MINIMAL_PROFILEDISCOVER
     return m_ProfileManager->setCurrentProfile(product,profileName);
 #else
     (void)product; /* avoid warning about unused parameter */
     (void)profileName; /* avoid warning about unused parameter */
-    return ::rtl::OUString();
+    return OUString();
 #endif
 }
 
@@ -207,8 +207,8 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException)
 {
 #ifndef MINIMAL_PROFILEDISCOVER
-    ::rtl::OUString profileName = aCode->getProfileName();
-    ::rtl::OUString currProfileName = getCurrentProfile();
+    OUString profileName = aCode->getProfileName();
+    OUString currProfileName = getCurrentProfile();
     ::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct();
 
      //if client provides a profileName, we will use it
@@ -246,12 +246,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory
 
         if (pServiceManager)
         {
-                ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) );
+                OUString aImplName( OUString::createFromAscii( pImplementationName ) );
                 Reference< XSingleServiceFactory > xFactory;
                 if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" )
                 {
-                    Sequence< ::rtl::OUString > aSNS( 1 );
-                    aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap");
+                    Sequence< OUString > aSNS( 1 );
+                    aSNS[0] = OUString( "com.sun.star.mozilla.MozillaBootstrap");
 
                     xFactory = ::cppu::createSingleFactory(
                         reinterpret_cast< XMultiServiceFactory* > ( pServiceManager),
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index b96838f4280e..05ac65bab150 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -53,31 +53,31 @@ namespace connectivity
             // OComponentHelper
             virtual void SAL_CALL disposing(void);
             // XInterface
-            static ::rtl::OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
-            static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
+            static OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
+            static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
 
             // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
             // XMozillaBootstrap
 
             // XProfileDiscover
             virtual ::sal_Int32 SAL_CALL getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
 
             // XProfileManager
-            virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
             virtual ::sal_Int32 SAL_CALL shutdownProfile(  ) throw (::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct(  ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException);
             virtual ::sal_Bool SAL_CALL isCurrentProfileLocked(  ) throw (::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
 
             // XProxyRunner
             virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 561b1ce5afab..029d9e39be67 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -42,10 +42,10 @@ using namespace ::com::sun::star::mozilla;
 namespace
 {
     // -------------------------------------------------------------------
-    static ::rtl::OUString lcl_getUserDataDirectory()
+    static OUString lcl_getUserDataDirectory()
     {
         ::osl::Security   aSecurity;
-        ::rtl::OUString   aConfigPath;
+        OUString   aConfigPath;
 
     #if defined(XP_WIN) || defined(MACOSX)
         aSecurity.getConfigDir( aConfigPath );
@@ -56,7 +56,7 @@ namespace
         aSecurity.getHomeDir( aConfigPath );
     #endif
 
-        return aConfigPath + ::rtl::OUString("/");
+        return aConfigPath + OUString("/");
     }
 
     // -------------------------------------------------------------------
@@ -88,26 +88,26 @@ namespace
     };
 
     // -------------------------------------------------------------------
-    static ::rtl::OUString lcl_guessProfileRoot( MozillaProductType _product )
+    static OUString lcl_guessProfileRoot( MozillaProductType _product )
     {
         size_t productIndex = _product - 1;
 
-        static ::rtl::OUString s_productDirectories[NB_PRODUCTS];
+        static OUString s_productDirectories[NB_PRODUCTS];
 
         if ( s_productDirectories[ productIndex ].isEmpty() )
         {
-            ::rtl::OUString sProductPath;
+            OUString sProductPath;
 
             // check whether we have an anevironment variable which helps us
             const char* pProfileByEnv = getenv( ProductRootEnvironmentVariable[ productIndex ] );
             if ( pProfileByEnv )
             {
-                sProductPath = ::rtl::OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() );
+                sProductPath = OUString( pProfileByEnv, rtl_str_getLength( pProfileByEnv ), osl_getThreadTextEncoding() );
                 // asume that this is fine, no further checks
             }
             else
             {
-                ::rtl::OUString sProductDirCandidate;
+                OUString sProductDirCandidate;
                 const char* pProfileRegistry = "profiles.ini";
 
                 // check all possible candidates
@@ -117,11 +117,11 @@ namespace
                         break;
 
                     sProductDirCandidate = lcl_getUserDataDirectory() +
-                        ::rtl::OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] );
+                        OUString::createFromAscii( DefaultProductDir[ productIndex ][ i ] );
 
                     // check existence
                     ::osl::DirectoryItem aRegistryItem;
-                    ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + ::rtl::OUString::createFromAscii( pProfileRegistry ), aRegistryItem );
+                    ::osl::FileBase::RC result = ::osl::DirectoryItem::get( sProductDirCandidate + OUString::createFromAscii( pProfileRegistry ), aRegistryItem );
                     if ( result == ::osl::FileBase::E_None  )
                     {
                         ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
@@ -145,10 +145,10 @@ namespace
 }
 
 // -----------------------------------------------------------------------
-::rtl::OUString getRegistryDir(MozillaProductType product)
+OUString getRegistryDir(MozillaProductType product)
 {
     if (product == MozillaProductType_Default)
-        return ::rtl::OUString();
+        return OUString();
 
     return lcl_guessProfileRoot( product );
 }
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index 609d0ea24e89..552fc2bc3d01 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
@@ -27,7 +27,7 @@
 
 #include <rtl/ustring.hxx>
 
-::rtl::OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product);
+OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product);
 
 #endif
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index e6941bcc5bad..7f078a776e94 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -30,13 +30,10 @@
 #include <stdio.h>
 #endif
 
-using ::rtl::OUString;
-using ::rtl::OString;
-
 struct ini_NameValue
 {
-    rtl::OUString sName;
-    rtl::OUString sValue;
+    OUString sName;
+    OUString sValue;
 
     inline ini_NameValue() SAL_THROW(())
         {}
@@ -53,10 +50,10 @@ typedef std::list<
 
 struct ini_Section
 {
-    rtl::OUString sName;
+    OUString sName;
     NameValueList lList;
 };
-typedef std::map<rtl::OUString,
+typedef std::map<OUString,
                 ini_Section
                 >IniSectionMap;
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 09d665bde55f..f432f33b46f4 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -114,9 +114,9 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
     {
         nsCOMPtr<nsILocalFile> binDir;
         // Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
-        rtl::OUString path1("$BRAND_BASE_DIR/program");
+        OUString path1("$BRAND_BASE_DIR/program");
         rtl::Bootstrap::expandMacros(path1);
-        rtl::OString path2;
+        OString path2;
         if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
              osl::FileBase::E_None) &&
             path1.convertToString(
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index cf9bb13b3dd9..9e91043dd41a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
@@ -31,7 +31,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::mozilla;
 
-using ::rtl::OUString;
 
 // Interfaces Needed
 
@@ -62,7 +61,7 @@ nsProfile::nsProfile()
     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);
 
@@ -135,7 +134,7 @@ NS_IMETHODIMP nsProfile::GetProfileList(PRUint32 *length, PRUnichar ***profileNa
     NS_ENSURE_ARG_POINTER(profileNames);
     *profileNames = nsnull;
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > list;
+    ::com::sun::star::uno::Sequence< OUString > list;
 
     *length = xMozillaBootstrap->getProfileList(xMozillaBootstrap->getCurrentProduct(),list);
 
@@ -182,7 +181,7 @@ nsProfile::GetCurrentProfile(PRUnichar **profileName)
         *profileName = (PRUnichar *)nsMemory::Clone(mCurrentProfileName.get(),(mCurrentProfileName.Length() + 1) * sizeof(PRUnichar ));
     else
     {
-        rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(xMozillaBootstrap->getCurrentProduct());
+        OUString profile = xMozillaBootstrap->getDefaultProfile(xMozillaBootstrap->getCurrentProduct());
         *profileName = (PRUnichar *)nsMemory::Clone(profile.getStr(),( profile.getLength() + 1) * sizeof(PRUnichar ));
         SetCurrentProfile(*profileName);
     }
@@ -451,7 +450,7 @@ NS_IMETHODIMP nsProfile::GetProfileDir(const PRUnichar *profileName, nsIFile **p
     *profileDir = nsnull;
 
     // PRUnichar != sal_Unicode in mingw
-    rtl::OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only<const sal_Unicode *>(profileName));
+    OUString path = xMozillaBootstrap->getProfilePath(xMozillaBootstrap->getCurrentProduct(),reinterpret_cast_mingw_only<const sal_Unicode *>(profileName));
 
     nsCOMPtr<nsILocalFile>  localFile;
     // PRUnichar != sal_Unicode in mingw
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 8640ba11bd41..6338eff8b4da 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -85,9 +85,9 @@ namespace connectivity
 {
     namespace mozab
     {
-        ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
+        ProfileStruct::ProfileStruct(MozillaProductType aProduct,OUString aProfileName,
 #ifdef MINIMAL_PROFILEDISCOVER
-            const ::rtl::OUString& aProfilePath
+            const OUString& aProfilePath
 #else
             nsILocalFile * aProfilePath
 #endif
@@ -97,7 +97,7 @@ namespace connectivity
             profileName = aProfileName;
             profilePath = aProfilePath;
         }
-        ::rtl::OUString ProfileStruct::getProfilePath()
+        OUString ProfileStruct::getProfilePath()
         {
 #ifdef MINIMAL_PROFILEDISCOVER
             return profilePath;
@@ -106,12 +106,12 @@ namespace connectivity
             {
                 nsAutoString path;
                 nsresult rv = profilePath->GetPath(path);
-                NS_ENSURE_SUCCESS(rv, ::rtl::OUString());
+                NS_ENSURE_SUCCESS(rv, OUString());
                 // PRUnichar != sal_Unicode in mingw
-                return ::rtl::OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(path.get()));
+                return OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(path.get()));
             }
             else
-                return ::rtl::OUString();
+                return OUString();
 #endif
         }
 
@@ -145,9 +145,9 @@ namespace connectivity
 #ifndef MINIMAL_PROFILEDISCOVER
             nsresult rv;
 #endif
-            ::rtl::OUString regDir = getRegistryDir(product);
-            ::rtl::OUString profilesIni( regDir );
-            profilesIni += ::rtl::OUString("profiles.ini");
+            OUString regDir = getRegistryDir(product);
+            OUString profilesIni( regDir );
+            profilesIni += OUString("profiles.ini");
             IniParser parser( profilesIni );
             IniSectionMap &mAllSection = *(parser.getAllSection());
 
@@ -156,10 +156,10 @@ namespace connectivity
             for(;iBegin != iEnd;++iBegin)
             {
                 ini_Section *aSection = &(*iBegin).second;
-                ::rtl::OUString profileName;
-                ::rtl::OUString profilePath;
-                ::rtl::OUString sIsRelative;
-                ::rtl::OUString sIsDefault;
+                OUString profileName;
+                OUString profilePath;
+                OUString sIsRelative;
+                OUString sIsDefault;
 
                 for(NameValueList::iterator itor=aSection->lList.begin();
                     itor != aSection->lList.end();
@@ -213,7 +213,7 @@ namespace connectivity
                     }
                     if (NS_FAILED(rv)) continue;
 #else
-                    rtl::OUString fullProfilePath;
+                    OUString fullProfilePath;
                     if(isRelative)
                     {
                         fullProfilePath = regDir + profilePath;
@@ -247,14 +247,14 @@ namespace connectivity
             return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
         }
 
-        ::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+        OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
         {
             sal_Int32 index=product;
             ProductStruct &m_Product = m_ProductProfileList[index];
             if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end())
             {
                 //Profile not found
-                return ::rtl::OUString();
+                return OUString();
             }
             else
                 return m_Product.mProfileList[profileName]->getProfilePath();
@@ -266,7 +266,7 @@ namespace connectivity
             ProductStruct &m_Product = m_ProductProfileList[index];
             return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
         }
-        ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
+        ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
         {
             sal_Int32 index=product;
             ProductStruct &m_Product = m_ProductProfileList[index];
@@ -284,7 +284,7 @@ namespace connectivity
             return static_cast< ::sal_Int32 >(m_Product.mProfileList.size());
         }
 
-        ::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
+        OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
         {
             sal_Int32 index=product;
             ProductStruct &m_Product = m_ProductProfileList[index];
@@ -296,7 +296,7 @@ namespace connectivity
             if (m_Product.mProfileList.empty())
             {
                 //there are not any profiles
-                return ::rtl::OUString();
+                return OUString();
             }
             ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second;
             return aProfile->getProfileName();
@@ -361,14 +361,14 @@ namespace connectivity
         }
 
 #endif
-        ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+        ::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
         {
 #ifdef MINIMAL_PROFILEDISCOVER
             (void)product; /* avoid warning about unused parameter */
             (void)profileName; /* avoid warning about unused parameter */
             return sal_True;
 #else
-            ::rtl::OUString path = getProfilePath(product,profileName);
+            OUString path = getProfilePath(product,profileName);
             if (path.isEmpty())
                 return sal_True;
 
@@ -395,7 +395,7 @@ namespace connectivity
 #endif
         }
 
-        ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+        ::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
         {
             sal_Int32 index=product;
             ProductStruct &m_Product = m_ProductProfileList[index];
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index ffdb9ecf53d9..7a4afef4dd29 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -43,7 +43,7 @@ namespace connectivity
         class ProfileStruct;
     }
 }
-typedef ::std::map < ::rtl::OUString, ::connectivity::mozab::ProfileStruct* > ProfileList;
+typedef ::std::map < OUString, ::connectivity::mozab::ProfileStruct* > ProfileList;
 namespace connectivity
 {
     namespace mozab
@@ -51,24 +51,24 @@ namespace connectivity
         class ProfileStruct
         {
         public:
-            ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
+            ProfileStruct(MozillaProductType aProduct,OUString aProfileName,
 #ifdef MINIMAL_PROFILEDISCOVER
-                          const ::rtl::OUString &aProfilePath
+                          const OUString &aProfilePath
 #else
                           nsILocalFile * aProfilePath
 #endif
                             );
             MozillaProductType getProductType() { return product;}
-            ::rtl::OUString getProfileName(){ return profileName;}
-            ::rtl::OUString getProfilePath() ;
+            OUString getProfileName(){ return profileName;}
+            OUString getProfilePath() ;
 #ifndef MINIMAL_PROFILEDISCOVER
             nsILocalFile    *getProfileLocal(){ return profilePath;}
 #endif
         protected:
             MozillaProductType product;
-            ::rtl::OUString profileName;
+            OUString profileName;
 #ifdef MINIMAL_PROFILEDISCOVER
-            ::rtl::OUString profilePath;
+            OUString profilePath;
 #else
             nsCOMPtr<nsILocalFile> profilePath;
 #endif
@@ -77,9 +77,9 @@ namespace connectivity
         class ProductStruct
         {
         public:
-            void setCurrentProfile(::rtl::OUString aProfileName){mCurrentProfileName = aProfileName;}
+            void setCurrentProfile(OUString aProfileName){mCurrentProfileName = aProfileName;}
 
-            ::rtl::OUString mCurrentProfileName;
+            OUString mCurrentProfileName;
 
             ProfileList mProfileList;
         };
@@ -91,12 +91,12 @@ namespace connectivity
 
             virtual ~ProfileAccess();
             ProfileAccess();
-            ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
             ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException);
-            ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
-            ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException);
+            OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
+            ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
+            ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
         protected:
             ProductStruct m_ProductProfileList[4];
             sal_Int32 LoadProductsInfo();
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
index 8615e2edb071..45999d06a4f0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
@@ -41,7 +41,7 @@ namespace connectivity
             ,aProfile(NULL)
         {
         }
-            ::sal_Int32 ProfileManager::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+            ::sal_Int32 ProfileManager::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
             {
                 if (!aProfile)
                 {
@@ -60,22 +60,22 @@ namespace connectivity
             {
                 return m_CurrentProduct;
             }
-            ::rtl::OUString ProfileManager::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
+            OUString ProfileManager::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
             {
                 nsresult rv;
                 nsCOMPtr<nsIProfile> theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-                     if (NS_FAILED(rv)) return ::rtl::OUString();
+                     if (NS_FAILED(rv)) return OUString();
                 nsXPIDLString currentProfileStr;
                 //call GetCurrentProfile before call SetCurrentProfile will get the default profile
                 rv = theProfile->GetCurrentProfile(getter_Copies(currentProfileStr));
                 if (NS_FAILED(rv) || currentProfileStr.get() == nsnull)
-                    return ::rtl::OUString();
+                    return OUString();
                 // PRUnichar != sal_Unicode in mingw
-                return ::rtl::OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(currentProfileStr.get()));
+                return OUString(reinterpret_cast_mingw_only<const sal_Unicode *>(currentProfileStr.get()));
             }
-            ::rtl::OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
+            OUString ProfileManager::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
             {
-                ::rtl::OUString currentProfile = getCurrentProfile();
+                OUString currentProfile = getCurrentProfile();
                 //if profileName not given, then skip and return curernt profile
                 if (profileName.isEmpty() && m_CurrentProduct == product)
                     return currentProfile;
@@ -88,13 +88,13 @@ namespace connectivity
                 //get profile mozilla profile service
                 nsresult rv;
                 nsCOMPtr<nsIProfile> theProfile(do_GetService(NS_PROFILE_CONTRACTID,&rv));
-                if (NS_FAILED(rv)) return ::rtl::OUString();
+                if (NS_FAILED(rv)) return OUString();
 
                 // PRUnichar != sal_Unicode in mingw
                 const PRUnichar* pUsedProfile = reinterpret_cast_mingw_only<const PRUnichar *>(profileName.getStr());
                 //set current profile
                 rv = theProfile->SetCurrentProfile( pUsedProfile );
-                if (NS_FAILED(rv)) return ::rtl::OUString();
+                if (NS_FAILED(rv)) return OUString();
                 return currentProfile;
             }
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index ae752de5f09c..3a93c3b682aa 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
@@ -46,11 +46,11 @@ namespace connectivity
             virtual ~ProfileManager();
             ProfileManager();
 
-            ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ;
+            ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ;
             ::sal_Int32 SAL_CALL shutdownProfile(  ) throw (::com::sun::star::uno::RuntimeException) ;
             ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct(  ) throw (::com::sun::star::uno::RuntimeException) ;
-            ::rtl::OUString SAL_CALL getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException) ;
-            ::rtl::OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ;
+            OUString SAL_CALL getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException) ;
+            OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ;
 
         protected:
             ::com::sun::star::mozilla::MozillaProductType m_CurrentProduct;