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

17 files changed, 112 insertions, 122 deletions

diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
index 23961db9e350..018b9991b4b0 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
@@ -187,7 +187,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDis
 
     // if it is decryption, the amount of data should be rounded to the block size even in case of padding
     if ( ( !m_bPadding || !m_bEncryption ) && nSizeForPadding )
-        throw uno::RuntimeException( ::rtl::OUString( "The data should contain complete blocks only." ), uno::Reference< uno::XInterface >() );
+        throw uno::RuntimeException( OUString( "The data should contain complete blocks only." ), uno::Reference< uno::XInterface >() );
 
     if ( m_bW3CPadding && m_bEncryption )
     {
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 24df691143c4..3ec0106ab6c6 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -70,8 +70,6 @@ namespace cssl = css::lang;
 
 using namespace xmlsecurity;
 using namespace com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OString;
 
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl"
 
@@ -162,7 +160,7 @@ void deleteRootsModule()
     }
 }
 
-::rtl::OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponentContext > &rxContext )
+OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponentContext > &rxContext )
 {
     // first, try to get the profile from "MOZILLA_CERTIFICATE_FOLDER"
     const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER");
@@ -171,14 +169,14 @@ void deleteRootsModule()
         SAL_INFO(
             "xmlsecurity.xmlsec",
             "Using Mozilla profile from MOZILLA_CERTIFICATE_FOLDER=" << pEnv);
-        return rtl::OString(pEnv);
+        return OString(pEnv);
     }
 
     // second, try to get saved user-preference
     try
     {
-        rtl::OUString sUserSetCertPath =
-            officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(rtl::OUString());
+        OUString sUserSetCertPath =
+            officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString());
 
         if (!sUserSetCertPath.isEmpty())
         {
@@ -186,7 +184,7 @@ void deleteRootsModule()
                 "xmlsecurity.xmlsec",
                 "Using Mozilla profile from /org.openoffice.Office.Common/"
                     "Security/Scripting/CertDir: " << sUserSetCertPath);
-            return rtl::OUStringToOString(sUserSetCertPath, osl_getThreadTextEncoding());
+            return OUStringToOString(sUserSetCertPath, osl_getThreadTextEncoding());
         }
     }
     catch (const uno::Exception &e)
@@ -214,21 +212,21 @@ void deleteRootsModule()
     {
         for (int i=0; i<nProduct; ++i)
         {
-            rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]);
+            OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]);
 
             if (!profile.isEmpty())
             {
-                rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile );
+                OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile );
                 SAL_INFO(
                     "xmlsecurity.xmlsec",
                     "Using Mozilla profile " << sProfilePath);
-                return rtl::OUStringToOString(sProfilePath, osl_getThreadTextEncoding());
+                return OUStringToOString(sProfilePath, osl_getThreadTextEncoding());
             }
         }
     }
 
     SAL_INFO("xmlsecurity.xmlsec", "No Mozilla profile found");
-    return rtl::OString();
+    return OString();
 }
 
 //Older versions of Firefox (FF), for example FF2, and Thunderbird (TB) 2 write
@@ -257,7 +255,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex
     bool return_value = true;
 
     // this method must be called only once, no need for additional lock
-    rtl::OString sCertDir;
+    OString sCertDir;
 
 #ifdef XMLSEC_CRYPTO_NSS
     sCertDir = getMozillaCurrentProfile(rxContext);
@@ -321,8 +319,8 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex
         OUString rootModulePath;
         if (::osl::File::E_None == ::osl::File::getSystemPathFromFileURL(rootModule, rootModulePath))
         {
-            ::rtl::OString ospath = ::rtl::OUStringToOString(rootModulePath, osl_getThreadTextEncoding());
-            ::rtl::OStringBuffer pkcs11moduleSpec;
+            OString ospath = OUStringToOString(rootModulePath, osl_getThreadTextEncoding());
+            OStringBuffer pkcs11moduleSpec;
             pkcs11moduleSpec.append("name=\"");
             pkcs11moduleSpec.append(ROOT_CERTS);
             pkcs11moduleSpec.append("\" library=\"");
@@ -437,10 +435,10 @@ css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer
         b1KData = ( nDigestID == css::xml::crypto::DigestID::SHA1_1K );
     }
     else
-        throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected digest requested." ), css::uno::Reference< css::uno::XInterface >(), 1 );
+        throw css::lang::IllegalArgumentException( OUString( "Unexpected digest requested." ), css::uno::Reference< css::uno::XInterface >(), 1 );
 
     if ( aParams.getLength() )
-        throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected arguments provided for digest creation." ), css::uno::Reference< css::uno::XInterface >(), 2 );
+        throw css::lang::IllegalArgumentException( OUString( "Unexpected arguments provided for digest creation." ), css::uno::Reference< css::uno::XInterface >(), 2 );
 
     css::uno::Reference< css::xml::crypto::XDigestContext > xResult;
     if( initNSS( m_xContext ) )
@@ -464,19 +462,19 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer
         bW3CPadding = true;
 
         if ( aKey.getLength() != 16 && aKey.getLength() != 24 && aKey.getLength() != 32 )
-            throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected key length." ), css::uno::Reference< css::uno::XInterface >(), 2 );
+            throw css::lang::IllegalArgumentException( OUString( "Unexpected key length." ), css::uno::Reference< css::uno::XInterface >(), 2 );
 
         if ( aParams.getLength() )
-            throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected arguments provided for cipher creation." ), css::uno::Reference< css::uno::XInterface >(), 5 );
+            throw css::lang::IllegalArgumentException( OUString( "Unexpected arguments provided for cipher creation." ), css::uno::Reference< css::uno::XInterface >(), 5 );
     }
     else
-        throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected cipher requested." ), css::uno::Reference< css::uno::XInterface >(), 1 );
+        throw css::lang::IllegalArgumentException( OUString( "Unexpected cipher requested." ), css::uno::Reference< css::uno::XInterface >(), 1 );
 
     css::uno::Reference< css::xml::crypto::XCipherContext > xResult;
     if( initNSS( m_xContext ) )
     {
         if ( aInitializationVector.getLength() != PK11_GetIVLength( nNSSCipherID ) )
-            throw css::lang::IllegalArgumentException( ::rtl::OUString( "Unexpected length of initialization vector." ), css::uno::Reference< css::uno::XInterface >(), 3 );
+            throw css::lang::IllegalArgumentException( OUString( "Unexpected length of initialization vector." ), css::uno::Reference< css::uno::XInterface >(), 3 );
 
         xResult = OCipherContext::Create( nNSSCipherID, aKey, aInitializationVector, bEncryption, bW3CPadding );
     }
@@ -484,25 +482,25 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer
     return xResult;
 }
 
-rtl::OUString ONSSInitializer_getImplementationName ()
+OUString ONSSInitializer_getImplementationName ()
     throw (cssu::RuntimeException)
 {
 
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL ONSSInitializer_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == NSS_SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) );
     return aRet;
 }
 
@@ -513,17 +511,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( con
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL ONSSInitializer::getImplementationName()
+OUString SAL_CALL ONSSInitializer::getImplementationName()
     throw (cssu::RuntimeException)
 {
     return ONSSInitializer_getImplementationName();
 }
-sal_Bool SAL_CALL ONSSInitializer::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL ONSSInitializer::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return ONSSInitializer_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return ONSSInitializer_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 4e6197d0e923..5e4fa780e61e 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -53,23 +53,23 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, ::sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::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);
 };
 
-rtl::OUString ONSSInitializer_getImplementationName()
+OUString ONSSInitializer_getImplementationName()
     throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL ONSSInitializer_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL ONSSInitializer_supportsService( const OUString& ServiceName )
     throw ( ::com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames()
+com::sun::star::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames()
     throw ( ::com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index e9ac78e694ac..f0782d0d780a 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -36,7 +36,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::security ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::security::XCertificateExtension ;
 
@@ -111,7 +110,7 @@ namespace {
                 case certOtherName: {
                     arrCertAltNameEntry[i].Type = ExtAltNameType_OTHER_NAME;
                     ::com::sun::star::beans::PropertyValue otherNameProp;
-                    otherNameProp.Name = ::rtl::OUString::createFromAscii(CERT_GetOidString(&current->name.OthName.oid));
+                    otherNameProp.Name = OUString::createFromAscii(CERT_GetOidString(&current->name.OthName.oid));
 
                     Sequence< sal_Int8 > otherName( current->name.OthName.name.len ) ;
                     for( unsigned int r = 0; r < current->name.OthName.name.len ; r ++ )
@@ -124,11 +123,11 @@ namespace {
                                     }
                 case certRFC822Name:
                     arrCertAltNameEntry[i].Type = ExtAltNameType_RFC822_NAME;
-                    arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
+                    arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
                     break;
                 case certDNSName:
                     arrCertAltNameEntry[i].Type = ExtAltNameType_DNS_NAME;
-                    arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
+                    arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
                     break;
                 case certX400Address: {
                     // unsupported
@@ -147,7 +146,7 @@ namespace {
                                         }
                 case certURI:
                     arrCertAltNameEntry[i].Type = ExtAltNameType_URL;
-                    arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
+                    arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
                     break;
                 case certIPAddress: {
                     arrCertAltNameEntry[i].Type = ExtAltNameType_IP_ADDRESS;
@@ -163,9 +162,9 @@ namespace {
                     arrCertAltNameEntry[i].Type = ExtAltNameType_REGISTERED_ID;
 
 
-                    rtl::OString nssOid = ::rtl::OString(CERT_GetOidString(&current->name.other));
-                    rtl::OString unoOid = removeOIDFromString(nssOid);
-                    arrCertAltNameEntry[i].Value <<= rtl::OStringToOUString( unoOid, RTL_TEXTENCODING_ASCII_US );
+                    OString nssOid = OString(CERT_GetOidString(&current->name.other));
+                    OString unoOid = removeOIDFromString(nssOid);
+                    arrCertAltNameEntry[i].Value <<= OStringToOUString( unoOid, RTL_TEXTENCODING_ASCII_US );
                     break;
             }
             current = CERT_GetNextGeneralName(current);
@@ -183,10 +182,10 @@ namespace {
     return m_Entries;
 }
 
-::rtl::OString SanExtensionImpl :: removeOIDFromString( const ::rtl::OString &oidString)
+OString SanExtensionImpl :: removeOIDFromString( const OString &oidString)
 {
-    ::rtl::OString objID;
-    ::rtl::OString oid("OID.");
+    OString objID;
+    OString oid("OID.");
     if (oidString.match(oid))
         objID = oidString.copy(oid.getLength());
     else
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
index 84f7f095fecc..ec9588da59d7 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx
@@ -39,7 +39,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1<
         ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ;
         ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries;
 
-        ::rtl::OString removeOIDFromString( const ::rtl::OString &oid);
+        OString removeOIDFromString( const OString &oid);
 
     public :
         SanExtensionImpl() ;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 8201fadbd0c5..1d38b2a5f15f 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -53,7 +53,6 @@ using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
 using ::com::sun::star::lang::XMultiServiceFactory ;
 using ::com::sun::star::lang::XSingleServiceFactory ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
 using ::com::sun::star::security::XCertificate ;
@@ -100,14 +99,14 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
 
     task::PasswordRequestMode eMode = bRetry ? task::PasswordRequestMode_PASSWORD_REENTER : task::PasswordRequestMode_PASSWORD_ENTER;
     ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest(
-        ::comphelper::DocPasswordRequestType_STANDARD, eMode, ::rtl::OUString::createFromAscii(PK11_GetTokenName(pSlot)) );
+        ::comphelper::DocPasswordRequestType_STANDARD, eMode, OUString::createFromAscii(PK11_GetTokenName(pSlot)) );
 
     uno::Reference< task::XInteractionRequest > xRequest( pPasswordRequest );
     xInteractionHandler->handle( xRequest );
 
     if ( pPasswordRequest->isPassword() )
     {
-        rtl::OString aPassword(rtl::OUStringToOString(
+        OString aPassword(OUStringToOString(
             pPasswordRequest->getPassword(),
             osl_getThreadTextEncoding()));
         sal_Int32 nLen = aPassword.getLength();
@@ -224,12 +223,12 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl :: getUnoTunnelId() {
     return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq();
 }
 
-::rtl::OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
+OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
 {
-    ::rtl::OUStringBuffer buff;
+    OUStringBuffer buff;
     for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++)
     {
-        buff.append(rtl::OUString::createFromAscii(PK11_GetTokenName(*is)));
+        buff.append(OUString::createFromAscii(PK11_GetTokenName(*is)));
         buff.appendAscii("\n");
     }
     return buff.makeStringAndClear();
@@ -560,7 +559,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
             throw RuntimeException() ;
 
         // Create cert info from issue and serial
-        rtl::OString ostr = rtl::OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 ) ;
+        OString ostr = OUStringToOString( issuerName , RTL_TEXTENCODING_UTF8 ) ;
         chIssuer = PL_strndup( ( char* )ostr.getStr(), ( int )ostr.getLength() ) ;
         nmIssuer = CERT_AsciiToName( chIssuer ) ;
         if( nmIssuer == NULL ) {
@@ -686,7 +685,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromAs
     xmlChar* chCert ;
     xmlSecSize certSize ;
 
-    rtl::OString oscert = rtl::OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ;
+    OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ;
 
     chCert = xmlStrndup( ( const xmlChar* )oscert.getStr(), ( int )oscert.getLength() ) ;
 
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index c8c0be10b4eb..482909936a91 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -77,18 +77,18 @@ private :
         ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
 
         //Methods from XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         virtual sal_Bool SAL_CALL supportsService(
-            const ::rtl::OUString& ServiceName
+            const 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for XServiceInfo
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ;
+        static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
-        static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for registry
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
@@ -105,7 +105,7 @@ private :
 
         virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ;
 
-        virtual ::rtl::OUString SAL_CALL getSecurityEnvironmentInformation(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getSecurityEnvironmentInformation(  ) throw (::com::sun::star::uno::RuntimeException);
 
         //Methods from XUnoTunnel
         virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
@@ -132,13 +132,13 @@ private :
 
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw(  ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const ::rtl::OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const ::rtl::OUString& issuerName, const ::rtl::OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
 
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw(  ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const ::rtl::OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
 
 
         //Native mehtods
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 980ff36a189d..740b02f12e3b 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -57,8 +57,6 @@ namespace cssl = css::lang;
 namespace cssxc = css::xml::crypto;
 
 using namespace com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OString;
 
 #define SE_SERVICE_NAME "com.sun.star.xml.crypto.SEInitializer"
 #define IMPLEMENTATION_NAME "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"
@@ -76,7 +74,7 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl()
 
 /* XSEInitializer */
 uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
-    SEInitializer_NssImpl::createSecurityContext( const ::rtl::OUString& )
+    SEInitializer_NssImpl::createSecurityContext( const OUString& )
     throw (uno::RuntimeException)
 {
     CERTCertDBHandle    *pCertHandle = NULL ;
@@ -89,12 +87,12 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     try
     {
         /* Build XML Security Context */
-        const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
+        const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
         uno::Reference< cssxc::XXMLSecurityContext > xSecCtx( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyContext, m_xContext), uno::UNO_QUERY );
         if( !xSecCtx.is() )
             return NULL;
 
-        const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
+        const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
         uno::Reference< cssxc::XSecurityEnvironment > xSecEnv( m_xContext->getServiceManager()->createInstanceWithContext(sSecyrutyEnvironment, m_xContext), uno::UNO_QUERY );
         uno::Reference< cssl::XUnoTunnel > xEnvTunnel( xSecEnv , uno::UNO_QUERY ) ;
         if( !xEnvTunnel.is() )
@@ -129,26 +127,26 @@ void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference<
     //NSS_Shutdown();
 }
 
-rtl::OUString SEInitializer_NssImpl_getImplementationName ()
+OUString SEInitializer_NssImpl_getImplementationName ()
     throw (uno::RuntimeException)
 {
 
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
     return ( ServiceName == SE_SERVICE_NAME || ServiceName == NSS_SERVICE_NAME );
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
+uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(2);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SE_SERVICE_NAME ) );
-    pArray[1] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) );
+    uno::Sequence < OUString > aRet(2);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SE_SERVICE_NAME ) );
+    pArray[1] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( NSS_SERVICE_NAME ) );
     return aRet;
 }
 
@@ -159,17 +157,17 @@ uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance(
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SEInitializer_NssImpl::getImplementationName(  )
+OUString SAL_CALL SEInitializer_NssImpl::getImplementationName(  )
     throw (uno::RuntimeException)
 {
     return SEInitializer_NssImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const OUString& rServiceName )
     throw (uno::RuntimeException)
 {
     return SEInitializer_NssImpl_supportsService( rServiceName );
 }
-uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames(  )
+uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames(  )
     throw (uno::RuntimeException)
 {
     return SEInitializer_NssImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index f75f8dbb8e83..f379edc7772a 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -42,7 +42,7 @@ public:
     /* XSEInitializer */
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::xml::crypto::XXMLSecurityContext >
-        SAL_CALL createSecurityContext( const ::rtl::OUString& )
+        SAL_CALL createSecurityContext( const OUString& )
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference<
@@ -50,23 +50,23 @@ public:
         throw (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);
 };
 
-rtl::OUString SEInitializer_NssImpl_getImplementationName()
+OUString SEInitializer_NssImpl_getImplementationName()
     throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_NssImpl_supportsService( const OUString& ServiceName )
     throw ( ::com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames(  )
     throw ( ::com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 45f477e5b963..3e81cd6b102f 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -36,7 +36,6 @@
 
 using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::security ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::security::XCertificate ;
 using ::com::sun::star::util::DateTime ;
@@ -76,7 +75,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s
     }
 }
 
-::rtl::OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
+OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
     if( m_pCert != NULL ) {
         return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ;
     } else {
@@ -84,7 +83,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s
     }
 }
 
-::rtl::OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) {
+OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) {
     if( m_pCert != NULL ) {
         return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8);
     } else {
@@ -186,11 +185,11 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s
 
         for( extns = m_pCert->extensions, len = 0; *extns != NULL; extns ++, len ++ ) {
             const SECItem id = (*extns)->id;
-            ::rtl::OString oidString(CERT_GetOidString(&id));
+            OString oidString(CERT_GetOidString(&id));
 
             // remove "OID." prefix if existing
-            ::rtl::OString objID;
-            ::rtl::OString oid("OID.");
+            OString objID;
+            OString oid("OID.");
             if (oidString.match(oid))
                 objID = oidString.copy(oid.getLength());
             else
@@ -230,7 +229,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s
         for( extns = m_pCert->extensions; *extns != NULL; extns ++ ) {
             if( SECITEM_CompareItem( &idItem, &(*extns)->id ) == SECEqual ) {
                 const SECItem id = (*extns)->id;
-                ::rtl::OString objId(CERT_GetOidString(&id));
+                OString objId(CERT_GetOidString(&id));
                 if ( objId.equals("OID.2.5.29.17") )
                     pExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ;
                 else
@@ -322,14 +321,14 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() {
     return theX509Certificate_NssImplUnoTunnelId::get().getSeq();
 }
 
-::rtl::OUString getAlgorithmDescription(SECAlgorithmID *aid)
+OUString getAlgorithmDescription(SECAlgorithmID *aid)
 {
     SECOidTag tag;
     tag = SECOID_GetAlgorithmTag(aid);
 
     const char *pDesc = SECOID_FindOIDTagDescription(tag);
 
-    return rtl::OUString::createFromAscii( pDesc ) ;
+    return OUString::createFromAscii( pDesc ) ;
 }
 
 ::com::sun::star::uno::Sequence< sal_Int8 > getThumbprint(CERTCertificate *pCert, SECOidTag id)
@@ -354,7 +353,7 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() {
     return ::com::sun::star::uno::Sequence< sal_Int8 >();
 }
 
-::rtl::OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
+OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( m_pCert != NULL )
@@ -390,7 +389,7 @@ const Sequence< sal_Int8>& X509Certificate_NssImpl :: getUnoTunnelId() {
     return ::com::sun::star::uno::Sequence< sal_Int8 >();
 }
 
-::rtl::OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
+OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( m_pCert != NULL )
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index 01ae74ee742a..ccc721151519 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -47,8 +47,8 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2<
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
 
-        virtual ::rtl::OUString SAL_CALL getIssuerName(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
-        virtual ::rtl::OUString SAL_CALL getSubjectName(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
+        virtual OUString SAL_CALL getIssuerName(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
+        virtual OUString SAL_CALL getSubjectName(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
 
         virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
         virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
@@ -62,13 +62,13 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2<
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded(  ) throw ( ::com::sun::star::uno::RuntimeException) ;
 
-        virtual ::rtl::OUString SAL_CALL getSubjectPublicKeyAlgorithm()
+        virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm()
             throw ( ::com::sun::star::uno::RuntimeException) ;
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
             throw ( ::com::sun::star::uno::RuntimeException) ;
 
-        virtual ::rtl::OUString SAL_CALL getSignatureAlgorithm()
+        virtual OUString SAL_CALL getSignatureAlgorithm()
             throw ( ::com::sun::star::uno::RuntimeException) ;
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 6e04c9decc31..ff797df81d67 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
 using ::com::sun::star::lang::XMultiServiceFactory ;
 using ::com::sun::star::lang::XSingleServiceFactory ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
 using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index d79cfdb2ade4..2c56aea0f234 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -67,18 +67,18 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper3<
         ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
 
         //Methods from XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         virtual sal_Bool SAL_CALL supportsService(
-            const ::rtl::OUString& ServiceName
+            const 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for XServiceInfo
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ;
+        static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
-        static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for registry
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index a53955db733e..cd3c863d3e7f 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
 using ::com::sun::star::lang::XMultiServiceFactory ;
 using ::com::sun::star::lang::XSingleServiceFactory ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::xml::crypto::XSecurityEnvironment ;
 using ::com::sun::star::xml::crypto::XXMLSecurityContext ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index acfcdc40b046..9e9928aa8c9a 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -85,18 +85,18 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper3<
         ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
 
         //Methods from XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         virtual sal_Bool SAL_CALL supportsService(
-            const ::rtl::OUString& ServiceName
+            const 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for XServiceInfo
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ;
+        static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
-        static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for registry
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 97fdb27454c5..9d7029c7b212 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::uno ;
 using namespace ::com::sun::star::lang ;
 using ::com::sun::star::lang::XMultiServiceFactory ;
 using ::com::sun::star::lang::XSingleServiceFactory ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::xml::wrapper::XXMLElementWrapper ;
 using ::com::sun::star::xml::wrapper::XXMLDocumentWrapper ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index 0dab87bc8e44..b3f123c54b92 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -67,18 +67,18 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper3<
         ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
 
         //Methods from XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         virtual sal_Bool SAL_CALL supportsService(
-            const ::rtl::OUString& ServiceName
+            const 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for XServiceInfo
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames() ;
+        static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ;
 
-        static ::rtl::OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
+        static OUString impl_getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;
 
         //Helper for registry
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aServiceManager ) throw( ::com::sun::star::uno::RuntimeException ) ;