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

90 files changed, 825 insertions, 847 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
index 8708f9b795e1..f7c3c6124a63 100644
--- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx
+++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx
@@ -26,8 +26,8 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include "com/sun/star/uno/Sequence.h"
 
-rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
-::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( rtl::OUString serialNumber );
+OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial );
+::com::sun::star::uno::Sequence< sal_Int8 > numericStringToBigInteger ( OUString serialNumber );
 
 #endif
 
diff --git a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
index ecf54af7ebb5..850bb6ab4f29 100644
--- a/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/certvalidity.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
 
-rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ;
+OUString certificateValidityToOUString( ::sal_Int32 certValidity ) ;
 
 #endif
 
diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
index 26b6c036a61c..3ca9f757a601 100644
--- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx
@@ -113,13 +113,13 @@ private:
 
     //Checks if a particular stream is a valid xml stream. Those are treated differently
     //when they are signed (c14n transformation)
-    bool isXML(const ::rtl::OUString& rURI );
+    bool isXML(const OUString& rURI );
     bool canAddRemove();
 
 public:
     DigitalSignaturesDialog( Window* pParent, cssu::Reference<
         cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
-        sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature);
+        sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature);
     ~DigitalSignaturesDialog();
 
     // Initialize the dialog and the security environment, returns TRUE on success
diff --git a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
index c4d6fb15cb43..35315c819d2b 100644
--- a/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx
@@ -72,21 +72,21 @@ public:
     static SignatureStreamHelper OpenSignatureStream(
         const css::uno::Reference < css::embed::XStorage >& rxStore, sal_Int32 nOpenMode,
         DocumentSignatureMode eDocSigMode );
-    static std::vector< rtl::OUString > CreateElementList(
+    static std::vector< OUString > CreateElementList(
         const css::uno::Reference < css::embed::XStorage >& rxStore,
-        const ::rtl::OUString rRootStorageName, DocumentSignatureMode eMode,
+        const OUString rRootStorageName, DocumentSignatureMode eMode,
         const DocumentSignatureAlgorithm mode);
-    static bool isODFPre_1_2(const ::rtl::OUString & sODFVersion);
+    static bool isODFPre_1_2(const OUString & sODFVersion);
     static bool isOOo3_2_Signature(const SignatureInformation & sigInfo);
     static DocumentSignatureAlgorithm getDocumentAlgorithm(
-        const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo);
-    static bool checkIfAllFilesAreSigned( const ::std::vector< ::rtl::OUString > & sElementList,
+        const OUString & sODFVersion, const SignatureInformation & sigInfo);
+    static bool checkIfAllFilesAreSigned( const ::std::vector< OUString > & sElementList,
         const SignatureInformation & sigInfo, const DocumentSignatureAlgorithm alg);
     static bool equalsReferenceUriManifestPath(
-        const ::rtl::OUString & rUri, const ::rtl::OUString & rPath);
-    static ::rtl::OUString GetDocumentContentSignatureDefaultStreamName();
-    static ::rtl::OUString GetScriptingContentSignatureDefaultStreamName();
-    static ::rtl::OUString GetPackageSignatureDefaultStreamName();
+        const OUString & rUri, const OUString & rPath);
+    static OUString GetDocumentContentSignatureDefaultStreamName();
+    static OUString GetScriptingContentSignatureDefaultStreamName();
+    static OUString GetPackageSignatureDefaultStreamName();
 
 };
 
diff --git a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
index 657ba6b61c49..77ab5d85defd 100644
--- a/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
+++ b/xmlsecurity/inc/xmlsecurity/sigstruct.hxx
@@ -36,10 +36,10 @@
 struct SignatureReferenceInformation
 {
     sal_Int32       nType;
-    rtl::OUString   ouURI;
-    rtl::OUString   ouDigestValue;
+    OUString   ouURI;
+    OUString   ouDigestValue;
 
-    SignatureReferenceInformation( sal_Int32 type, rtl::OUString uri )
+    SignatureReferenceInformation( sal_Int32 type, OUString uri )
     {
         nType = type;
         ouURI = uri;
@@ -54,10 +54,10 @@ struct SignatureInformation
     sal_Int32 nSecurityEnvironmentIndex;
     ::com::sun::star::xml::crypto::SecurityOperationStatus nStatus;
     SignatureReferenceInformations  vSignatureReferenceInfors;
-    rtl::OUString ouX509IssuerName;
-    rtl::OUString ouX509SerialNumber;
-    rtl::OUString ouX509Certificate;
-    rtl::OUString ouSignatureValue;
+    OUString ouX509IssuerName;
+    OUString ouX509SerialNumber;
+    OUString ouX509Certificate;
+    OUString ouSignatureValue;
     ::com::sun::star::util::DateTime stDateTime;
 
     //We also keep the date and time as string. This is done when this
@@ -71,9 +71,9 @@ struct SignatureInformation
     //milli seconds (because the document was created by an application other than OOo)
     //and the converted time is written back, then the string looks different
     //and the signature is broken.
-    rtl::OUString ouDateTime;
-    rtl::OUString ouSignatureId;
-    rtl::OUString ouPropertyId;
+    OUString ouDateTime;
+    OUString ouSignatureId;
+    OUString ouPropertyId;
 
     SignatureInformation( sal_Int32 nId )
     {
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 4e06d45d75e0..b9e85e781412 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -130,7 +130,7 @@ public:
     // Set the storage which should be used by the default UriBinding
     // Must be set before StatrtMission().
     //sODFVersion indicates  the ODF version
-    void        SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, ::rtl::OUString sODFVersion );
+    void        SetStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage, OUString sODFVersion );
 
                 // Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
                 // Return 1 to verify, 0 to skip.
@@ -166,12 +166,12 @@ public:
         for finding the certificate apparently use memcmp - hence they fail to find the
         certificate.
      */
-    void SetX509Certificate(sal_Int32 nSecurityId, const rtl::OUString& ouX509IssuerName,
-        const rtl::OUString& ouX509SerialNumber, const rtl::OUString& ouX509Cert);
+    void SetX509Certificate(sal_Int32 nSecurityId, const OUString& ouX509IssuerName,
+        const OUString& ouX509SerialNumber, const OUString& ouX509Cert);
 
     void        SetDateTime( sal_Int32 nSecurityId, const Date& rDate, const Time& rTime );
 
-    void        AddForSigning( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary );
+    void        AddForSigning( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary );
     bool        CreateAndWriteSignature( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler );
     bool        ReadAndVerifySignature( const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& xInputStream );
 
diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx
index f223bfb4abcb..04ed64fd564e 100644
--- a/xmlsecurity/qa/certext/SanCertExt.cxx
+++ b/xmlsecurity/qa/certext/SanCertExt.cxx
@@ -56,7 +56,7 @@ namespace {
 
         uno::Reference< xml::crypto::XSecurityEnvironment > initUno();
         void init();
-        rtl::OString getB64CertFromFile(const char filename[]);
+        OString getB64CertFromFile(const char filename[]);
         test::OfficeConnection connection_;
 
     public:
@@ -130,7 +130,7 @@ namespace {
         uno::Reference< lang::XMultiServiceFactory > factory(context->getServiceManager(), uno::UNO_QUERY_THROW);
         uno::Reference< xml::crypto::XSEInitializer > xSEInitializer = xml::crypto::SEInitializer::create(context);
         uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext(
-            xSEInitializer->createSecurityContext(rtl::OUString()));
+            xSEInitializer->createSecurityContext(OUString()));
         return xSecurityContext->getSecurityEnvironment();
     }
 
@@ -138,14 +138,14 @@ namespace {
     void Test::init()
     {
         uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv = initUno();
-        rtl::OString b64Cert(getB64CertFromFile("User_35_Root_11.crt"));
+        OString b64Cert(getB64CertFromFile("User_35_Root_11.crt"));
         uno::Reference< security::XCertificate > xCert = xSecurityEnv->createCertificateFromAscii(
-            rtl::OStringToOUString( b64Cert, RTL_TEXTENCODING_ASCII_US ) );
+            OStringToOUString( b64Cert, RTL_TEXTENCODING_ASCII_US ) );
         uno::Sequence< uno::Reference< security::XCertificateExtension > > extensions = xCert->getExtensions();
         for (sal_Int32 i = 0 ; i < extensions.getLength(); i++)
         {
             uno::Reference< security::XCertificateExtension >element = extensions[i];
-            rtl::OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength());
+            OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength());
             if (aId.equals(OID_SUBJECT_ALTERNATIVE_NAME))
             {
                 uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY );
@@ -155,11 +155,11 @@ namespace {
         }
     }
 
-    rtl::OString Test::getB64CertFromFile(const char filename[])
+    OString Test::getB64CertFromFile(const char filename[])
     {
         ne_ssl_certificate* cert = ne_ssl_cert_read(filename);
         char* certExportB64 = ne_ssl_cert_export(cert);
-        rtl::OString certB64( certExportB64 );
+        OString certB64( certExportB64 );
         return certB64;
     }
 
@@ -179,7 +179,7 @@ namespace {
                 ::com::sun::star::beans::NamedValue otherNameProp;
                 if (altNames[n].Value >>= otherNameProp)
                 {
-                    CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("1.2.3.4"), otherNameProp.Name);
+                    CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("1.2.3.4"), otherNameProp.Name);
                     uno::Sequence< sal_Int8 > ipAddress;
                     otherNameProp.Value >>= ipAddress;
                     CPPUNIT_ASSERT_ASSERTION_PASS( CPPUNIT_ASSERT( ipAddress.getLength() > 0 ) );
@@ -194,9 +194,9 @@ namespace {
         {
             if (altNames[n].Type ==  security::ExtAltNameType_RFC822_NAME)
             {
-                rtl::OUString value;
+                OUString value;
                 altNames[n].Value >>= value;
-                CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("my@other.address"), value);
+                CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("my@other.address"), value);
             }
         }
     }
@@ -207,9 +207,9 @@ namespace {
         {
             if (altNames[n].Type ==  security::ExtAltNameType_DNS_NAME)
             {
-                rtl::OUString value;
+                OUString value;
                 altNames[n].Value >>= value;
-                CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("alt.openoffice.org"), value);
+                CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("alt.openoffice.org"), value);
             }
         }
     }
@@ -224,9 +224,9 @@ namespace {
         {
             if (altNames[n].Type ==  security::ExtAltNameType_URL)
             {
-                rtl::OUString value;
+                OUString value;
                 altNames[n].Value >>= value;
-                CPPUNIT_ASSERT_EQUAL( rtl::OUString::createFromAscii("http://my.url.here/"), value);
+                CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii("http://my.url.here/"), value);
             }
         }
     }
@@ -251,9 +251,9 @@ namespace {
         {
             if (altNames[n].Type ==  security::ExtAltNameType_REGISTERED_ID)
             {
-                rtl::OUString value;
+                OUString value;
                 altNames[n].Value >>= value;
-                CPPUNIT_ASSERT( rtl::OUString::createFromAscii("1.2.3.4").equals(value));
+                CPPUNIT_ASSERT( OUString::createFromAscii("1.2.3.4").equals(value));
             }
         }
     }
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx
index 9ce0685e1cd9..7fc736b4bdf9 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
 
 
 sal_Bool
-CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap )
+CertificateContainer::searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap )
 {
     Map::iterator p = _certMap.find(url);
 
@@ -44,7 +44,7 @@ CertificateContainer::searchMap( const ::rtl::OUString & url, const ::rtl::OUStr
 // -------------------------------------------------------------------
 
 sal_Bool
-CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name )
+CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return searchMap( url, certificate_name, certMap);
@@ -53,7 +53,7 @@ CertificateContainer::isTemporaryCertificate ( const ::rtl::OUString & url, cons
 // -------------------------------------------------------------------
 
 sal_Bool
-CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name )
+CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return searchMap( url, certificate_name, certTrustMap);
@@ -61,7 +61,7 @@ CertificateContainer::isCertificateTrust ( const ::rtl::OUString & url, const ::
 
 // -------------------------------------------------------------------
 sal_Bool
-CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust )
+CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust )
     throw(::com::sun::star::uno::RuntimeException)
 {
     certMap.insert( Map::value_type( url, certificate_name ) );
@@ -75,7 +75,7 @@ CertificateContainer::addCertificate( const ::rtl::OUString & url, const ::rtl::
 
 //-------------------------------------------------------------------------
 ::security::CertificateContainerStatus
-CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException)
+CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( isTemporaryCertificate( url, certificate_name ) )
     {
@@ -90,7 +90,7 @@ CertificateContainer::hasCertificate( const ::rtl::OUString & url, const ::rtl::
 }
 //-------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
 CertificateContainer::getImplementationName( )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -100,7 +100,7 @@ CertificateContainer::getImplementationName( )
 //-------------------------------------------------------------------------
 
 sal_Bool SAL_CALL
-CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
+CertificateContainer::supportsService( const OUString& ServiceName )
     throw(::com::sun::star::uno::RuntimeException)
 {
     if ( ServiceName.compareToAscii("com.sun.star.security.CertificateContainer") == 0 )
@@ -111,7 +111,7 @@ CertificateContainer::supportsService( const ::rtl::OUString& ServiceName )
 
 //-------------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
 CertificateContainer::getSupportedServiceNames(  )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -120,22 +120,22 @@ CertificateContainer::getSupportedServiceNames(  )
 
 //-------------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > SAL_CALL
+Sequence< OUString > SAL_CALL
 CertificateContainer::impl_getStaticSupportedServiceNames(  )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    Sequence< ::rtl::OUString > aRet(1);
-    *aRet.getArray() = ::rtl::OUString("com.sun.star.security.CertificateContainer");
+    Sequence< OUString > aRet(1);
+    *aRet.getArray() = OUString("com.sun.star.security.CertificateContainer");
     return aRet;
 }
 
 //-------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
 CertificateContainer::impl_getStaticImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.security.CertificateContainer");
+    return OUString("com.sun.star.security.CertificateContainer");
 }
 
 //-------------------------------------------------------------------------
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index 0bd92f617445..03b60863e387 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -42,38 +42,38 @@ using namespace ::com::sun::star::lang;
 class CertificateContainer : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::security::XCertificateContainer >
 {
     private:
-        typedef std::map< ::rtl::OUString, ::rtl::OUString > Map;
+        typedef std::map< OUString, OUString > Map;
         Map certMap;
         Map certTrustMap;
 
-        ::sal_Bool SAL_CALL searchMap( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, Map &_certMap  );
-        virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Bool SAL_CALL isCertificateTrust( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+        ::sal_Bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap  );
+        virtual ::sal_Bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
 
     public:
 
         CertificateContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) {};
         virtual ~CertificateContainer(){};
 
-        virtual ::sal_Bool SAL_CALL addCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException);
-        virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException);
         // provide factory
-    static ::rtl::OUString SAL_CALL
+    static OUString SAL_CALL
                                         impl_getStaticImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
                     impl_getStaticSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
     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 >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException );
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL
+    virtual 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);
+                                        supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
                                         getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
 };
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 542518917fbc..4d366f42518b 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -118,7 +118,7 @@ void DocumentDigitalSignatures::showDocumentContentSignatures(
     ImplViewSignatures( rxStorage, xSignInStream, SignatureModeDocumentContent, true );
 }
 
-::rtl::OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName()
+OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName()
     throw (css::uno::RuntimeException)
 {
     return DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName();
@@ -150,7 +150,7 @@ void DocumentDigitalSignatures::showScriptingContentSignatures(
     ImplViewSignatures( rxStorage, xSignInStream, SignatureModeMacros, true );
 }
 
-::rtl::OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName()
+OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName()
     throw (css::uno::RuntimeException)
 {
     return DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName();
@@ -182,7 +182,7 @@ void DocumentDigitalSignatures::showPackageSignatures(
     ImplViewSignatures( rxStorage, xSignInStream, SignatureModePackage, true );
 }
 
-::rtl::OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName(  )
+OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName(  )
     throw (::com::sun::star::uno::RuntimeException)
 {
     return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName();
@@ -294,9 +294,9 @@ DocumentDigitalSignatures::ImplVerifySignatures(
         {
             DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm(
                 m_sODFVersion, aSignInfos[n]);
-            const std::vector< rtl::OUString > aElementsToBeVerified =
+            const std::vector< OUString > aElementsToBeVerified =
                 DocumentSignatureHelper::CreateElementList(
-                rxStorage, ::rtl::OUString(), eMode, mode);
+                rxStorage, OUString(), eMode, mode);
 
             const SignatureInformation& rInfo = aSignInfos[n];
             css::security::DocumentSignatureInformation& rSigInfo = arInfos[n];
@@ -398,7 +398,7 @@ void DocumentDigitalSignatures::showCertificate(
     Reference<security::XSerialNumberAdapter> xSerialNumberAdapter =
         ::com::sun::star::security::SerialNumberAdapter::create(mxCtx);
 
-    ::rtl::OUString sSerialNum = xSerialNumberAdapter->toString( Author->getSerialNumber() );
+    OUString sSerialNum = xSerialNumberAdapter->toString( Author->getSerialNumber() );
 
     Sequence< SvtSecurityOptions::Certificate > aTrustedAuthors = SvtSecurityOptions().GetTrustedAuthors();
     const SvtSecurityOptions::Certificate* pAuthors = aTrustedAuthors.getConstArray();
@@ -438,15 +438,15 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertif
 }
 
 
-::sal_Bool DocumentDigitalSignatures::isLocationTrusted( const ::rtl::OUString& Location ) throw (RuntimeException)
+::sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) throw (RuntimeException)
 {
     sal_Bool bFound = sal_False;
     INetURLObject aLocObj( Location );
     INetURLObject aLocObjLowCase( Location.toAsciiLowerCase() ); // will be used for case insensitive comparing
 
-    Sequence< ::rtl::OUString > aSecURLs = SvtSecurityOptions().GetSecureURLs();
-    const ::rtl::OUString* pSecURLs = aSecURLs.getConstArray();
-    const ::rtl::OUString* pSecURLsEnd = pSecURLs + aSecURLs.getLength();
+    Sequence< OUString > aSecURLs = SvtSecurityOptions().GetSecureURLs();
+    const OUString* pSecURLs = aSecURLs.getConstArray();
+    const OUString* pSecURLsEnd = pSecURLs + aSecURLs.getLength();
     for ( ; pSecURLs != pSecURLsEnd && !bFound; ++pSecURLs )
         bFound = ::utl::UCBContentHelper::IsSubPath( *pSecURLs, Location );
 
@@ -465,7 +465,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources(
     aNewCert[ 0 ] = Author->getIssuerName();
     aNewCert[ 1 ] = xSerialNumberAdapter->toString( Author->getSerialNumber() );
 
-    rtl::OUStringBuffer aStrBuffer;
+    OUStringBuffer aStrBuffer;
     ::sax::Converter::encodeBase64(aStrBuffer, Author->getEncoded());
     aNewCert[ 2 ] = aStrBuffer.makeStringAndClear();
 
@@ -478,11 +478,11 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources(
     aSecOpts.SetTrustedAuthors( aTrustedAuthors );
 }
 
-void DocumentDigitalSignatures::addLocationToTrustedSources( const ::rtl::OUString& Location ) throw (RuntimeException)
+void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) throw (RuntimeException)
 {
     SvtSecurityOptions aSecOpt;
 
-    Sequence< ::rtl::OUString > aSecURLs = aSecOpt.GetSecureURLs();
+    Sequence< OUString > aSecURLs = aSecOpt.GetSecureURLs();
     sal_Int32 nCnt = aSecURLs.getLength();
     aSecURLs.realloc( nCnt + 1 );
     aSecURLs[ nCnt ] = Location;
@@ -490,16 +490,16 @@ void DocumentDigitalSignatures::addLocationToTrustedSources( const ::rtl::OUStri
     aSecOpt.SetSecureURLs( aSecURLs );
 }
 
-rtl::OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException)
+OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException)
 {
-    return rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" );
+    return OUString( "com.sun.star.security.DocumentDigitalSignatures" );
 }
 
-Sequence< rtl::OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException)
+Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException)
 {
-    Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" );
+    Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString( "com.sun.star.security.DocumentDigitalSignatures" );
     return aRet;
 }
 
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index 141bc911ca1d..a9f07d6f50b0 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -44,7 +44,7 @@ class DocumentDigitalSignatures : public cppu::WeakImplHelper2
 private:
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxCtx;
     // will be set by XInitialization. If not we assume true. false means an earlier version.
-    ::rtl::OUString m_sODFVersion;
+    OUString m_sODFVersion;
     //The number of arguments which were passed in XInitialization::initialize
     int m_nArgumentsCount;
     //Indicates if the document already contains a document signature
@@ -58,8 +58,8 @@ public:
     DocumentDigitalSignatures( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext>& rxCtx );
 
     // for service registration...
-    static ::rtl::OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Sequence < ::rtl::OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+    static OUString GetImplementationName() throw (com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Sequence < OUString > GetSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
 
     //XInitialization
     void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
@@ -69,21 +69,21 @@ public:
     ::sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException);
-    ::rtl::OUString SAL_CALL getDocumentContentSignatureDefaultStreamName(  ) throw (::com::sun::star::uno::RuntimeException);
+    OUString SAL_CALL getDocumentContentSignatureDefaultStreamName(  ) throw (::com::sun::star::uno::RuntimeException);
     ::sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException);
-    ::rtl::OUString SAL_CALL getScriptingContentSignatureDefaultStreamName(  ) throw (::com::sun::star::uno::RuntimeException);
+    OUString SAL_CALL getScriptingContentSignatureDefaultStreamName(  ) throw (::com::sun::star::uno::RuntimeException);
     ::sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException);
     ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException);
-    ::rtl::OUString SAL_CALL getPackageSignatureDefaultStreamName(  ) throw (::com::sun::star::uno::RuntimeException);
+    OUString SAL_CALL getPackageSignatureDefaultStreamName(  ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL manageTrustedSources(  ) throw (::com::sun::star::uno::RuntimeException);
     ::sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException);
-    ::sal_Bool SAL_CALL isLocationTrusted( const ::rtl::OUString& Location ) throw (::com::sun::star::uno::RuntimeException);
+    ::sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException);
     void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException);
-    void SAL_CALL addLocationToTrustedSources( const ::rtl::OUString& Location ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException);
 
     ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException);
 };
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index 3fc1011615fe..82ccbec2924f 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -36,14 +36,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_
     uno::Reference< XInterface > xFactory;
 
     //Decryptor
-    rtl::OUString implName = rtl::OUString::createFromAscii( pImplName );
+    OUString implName = OUString::createFromAscii( pImplName );
 
     if ( pServiceManager && implName.equals( DocumentDigitalSignatures::GetImplementationName() ) )
     {
         // DocumentDigitalSignatures
         xFactory = cppu::createSingleComponentFactory(
             DocumentDigitalSignatures_CreateInstance,
-            rtl::OUString::createFromAscii( pImplName ),
+            OUString::createFromAscii( pImplName ),
             DocumentDigitalSignatures::GetSupportedServiceNames() );
     }
     else if ( pServiceManager && implName.equals( CertificateContainer::impl_getStaticImplementationName() ))
@@ -51,7 +51,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_
         // CertificateContainer
         xFactory = cppu::createOneInstanceFactory(
             reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
-            rtl::OUString::createFromAscii( pImplName ),
+            OUString::createFromAscii( pImplName ),
             CertificateContainer::impl_createInstance,
             CertificateContainer::impl_getStaticSupportedServiceNames() );
     }
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index f57ab567afce..28613293f4b2 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -141,7 +141,7 @@ void CertificateChooser::ImplInitialize()
             // Do we already use that?
             if( nCertificatesToIgnore )
             {
-                rtl::OUString aIssuerName = xCert->getIssuerName();
+                OUString aIssuerName = xCert->getIssuerName();
                 for( sal_Int32 nSig = 0; nSig < nCertificatesToIgnore; ++nSig )
                 {
                     const SignatureInformation& rInf = maCertsToIgnore[ nSig ];
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 3703542c7cf3..36461fe48922 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -266,7 +266,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
     OUString                aLBEntry;
     OUString                aDetails;
     // Certificate Versions are reported wrong (#i35107#) - 0 == "V1", 1 == "V2", ..., n = "V(n+1)"
-    aLBEntry = rtl::OUString( "V" );
+    aLBEntry = OUString( "V" );
     aLBEntry += OUString::valueOf( sal_Int32( xCert->getVersion() + 1 ) );
     InsertElement( XMLSEC_RES( STR_VERSION ), aLBEntry, aLBEntry );
     Sequence< sal_Int8 >    aSeq = xCert->getSerialNumber();
@@ -274,7 +274,7 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
     aDetails = XmlSec::GetHexString( aSeq, pHexSep, nLineBreak );
     InsertElement( XMLSEC_RES( STR_SERIALNUM ), aLBEntry, aDetails, true );
 
-    std::pair< ::rtl::OUString, ::rtl::OUString> pairIssuer =
+    std::pair< OUString, OUString> pairIssuer =
         XmlSec::GetDNForCertDetailsView(xCert->getIssuerName());
     aLBEntry = pairIssuer.first;
     aDetails = pairIssuer.second;
@@ -283,16 +283,16 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, Certif
     DateTime aDateTime( DateTime::EMPTY );
     utl::typeConvert( xCert->getNotValidBefore(), aDateTime );
     aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() );
-    aLBEntry += rtl::OUString( " " );
+    aLBEntry += OUString( " " );
     aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() );
     InsertElement( XMLSEC_RES( STR_VALIDFROM ), aLBEntry, aLBEntry  );
     utl::typeConvert( xCert->getNotValidAfter(), aDateTime );
     aLBEntry = GetSettings().GetUILocaleDataWrapper().getDate( aDateTime.GetDate() );
-    aLBEntry += rtl::OUString( " " );
+    aLBEntry += OUString( " " );
     aLBEntry += GetSettings().GetUILocaleDataWrapper().getTime( aDateTime.GetTime() );
     InsertElement( XMLSEC_RES( STR_VALIDTO ), aLBEntry, aLBEntry );
 
-    std::pair< ::rtl::OUString, ::rtl::OUString > pairSubject =
+    std::pair< OUString, OUString > pairSubject =
         XmlSec::GetDNForCertDetailsView(xCert->getSubjectName());
     aLBEntry = pairSubject.first;
     aDetails = pairSubject.second;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 58c5e8b7e2b4..1d43341e2025 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -75,7 +75,7 @@ namespace
         sal_Int16 m_nODF;
     public:
     virtual void Commit();
-    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames );
         SaveODFItem();
         //See group ODF in Common.xcs
         bool isLessODF1_2()
@@ -85,9 +85,9 @@ namespace
     };
 
 void SaveODFItem::Commit() {}
-void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
 
-    SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString(
+    SaveODFItem::SaveODFItem(): utl::ConfigItem(OUString(
         "Office.Common/Save")), m_nODF(0)
     {
         OUString sDef("ODF/DefaultVersion");
@@ -115,7 +115,7 @@ void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >
     The parameter is an encoded uri. However, the manifest contains paths. Therefore
     the path is encoded as uri, so they can be compared.
 */
-bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI )
+bool DigitalSignaturesDialog::isXML(const OUString& rURI )
 {
     OSL_ASSERT(mxStore.is());
 
@@ -171,7 +171,7 @@ bool DigitalSignaturesDialog::isXML(const rtl::OUString& rURI )
 DigitalSignaturesDialog::DigitalSignaturesDialog(
     Window* pParent,
     uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode,
-    sal_Bool bReadOnly, const ::rtl::OUString& sODFVersion, bool bHasDocumentSignature)
+    sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature)
     : ModalDialog(pParent, "DigitalSignaturesDialog", "xmlsec/ui/digitalsignaturesdialog.ui")
     , mxCtx(rxCtx)
     , maSignatureHelper(rxCtx)
@@ -428,7 +428,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
                 SAL_WARN( "xmlsecurity.dialogs", "no certificate selected" );
                 return -1;
             }
-            rtl::OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() );
+            OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() );
             if ( aCertSerial.isEmpty() )
             {
                 OSL_FAIL( "Error in Certificate, problem with serial number!" );
@@ -439,16 +439,16 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl)
 
             sal_Int32 nSecurityId = maSignatureHelper.GetNewSecurityId();
 
-            rtl::OUStringBuffer aStrBuffer;
+            OUStringBuffer aStrBuffer;
             ::sax::Converter::encodeBase64(aStrBuffer, xCert->getEncoded());
 
             maSignatureHelper.SetX509Certificate( nSecurityId,
                 xCert->getIssuerName(), aCertSerial,
                 aStrBuffer.makeStringAndClear());
 
-            std::vector< rtl::OUString > aElements =
+            std::vector< OUString > aElements =
                 DocumentSignatureHelper::CreateElementList(
-                    mxStore, rtl::OUString(), meSignatureMode, OOo3_2Document);
+                    mxStore, OUString(), meSignatureMode, OOo3_2Document);
 
             sal_Int32 nElements = aElements.size();
             for ( sal_Int32 n = 0; n < nElements; n++ )
@@ -585,9 +585,9 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
         {
             DocumentSignatureAlgorithm mode = DocumentSignatureHelper::getDocumentAlgorithm(
                 m_sODFVersion, maCurrentSignatureInformations[n]);
-            std::vector< rtl::OUString > aElementsToBeVerified =
+            std::vector< OUString > aElementsToBeVerified =
                 DocumentSignatureHelper::CreateElementList(
-                mxStore, ::rtl::OUString(), meSignatureMode, mode);
+                mxStore, OUString(), meSignatureMode, mode);
 
             const SignatureInformation& rInfo = maCurrentSignatureInformations[n];
             //First we try to get the certificate which is embedded in the XML Signature
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index ab8cd6d5ec02..73d483f45347 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -240,12 +240,12 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl)
         if( ui::dialogs::ExecutableDialogResults::OK != nRet )
             return 0;
 
-        rtl::OUString aPathStr = xFolderPicker->getDirectory();
+        OUString aPathStr = xFolderPicker->getDirectory();
         INetURLObject aNewObj( aPathStr );
         aNewObj.removeFinalSlash();
 
         // then the new path also an URL else system path
-        ::rtl::OUString aSystemFileURL = ( aNewObj.GetProtocol() != INET_PROT_NOT_VALID ) ?
+        OUString aSystemFileURL = ( aNewObj.GetProtocol() != INET_PROT_NOT_VALID ) ?
             aPathStr : aNewObj.getFSysPath( INetURLObject::FSYS_DETECT );
 
         OUString aNewPathStr(aSystemFileURL);
@@ -311,7 +311,7 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void )
     {
         for( sal_uInt32 nEntry = 0 ; nEntry < nEntries ; ++nEntry )
         {
-            css::uno::Sequence< ::rtl::OUString >&              rEntry = maTrustedAuthors[ nEntry ];
+            css::uno::Sequence< OUString >&              rEntry = maTrustedAuthors[ nEntry ];
             uno::Reference< css::security::XCertificate >   xCert;
 
             // create from RawData
@@ -384,7 +384,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M
 
     FillCertLB();
 
-    css::uno::Sequence< rtl::OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
+    css::uno::Sequence< OUString > aSecureURLs = mpDlg->maSecOptions.GetSecureURLs();
     mbURLsReadonly = mpDlg->maSecOptions.IsReadOnly( SvtSecurityOptions::E_SECUREURLS );
     m_pTrustFileROFI->Show( mbURLsReadonly );
     m_pTrustFileLocLB->Enable( !mbURLsReadonly );
@@ -393,7 +393,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M
     sal_Int32 nEntryCnt = aSecureURLs.getLength();
     for( sal_Int32 i = 0 ; i < nEntryCnt ; ++i )
     {
-        ::rtl::OUString aSystemFileURL( aSecureURLs[ i ] );
+        OUString aSystemFileURL( aSecureURLs[ i ] );
         osl::FileBase::getSystemPathFromFileURL( aSystemFileURL, aSystemFileURL );
         m_pTrustFileLocLB->InsertEntry( aSystemFileURL );
     }
@@ -415,10 +415,10 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
     sal_uInt16  nEntryCnt = m_pTrustFileLocLB->GetEntryCount();
     if( nEntryCnt )
     {
-        css::uno::Sequence< rtl::OUString > aSecureURLs( nEntryCnt );
+        css::uno::Sequence< OUString > aSecureURLs( nEntryCnt );
         for( sal_uInt16 i = 0 ; i < nEntryCnt ; ++i )
         {
-            ::rtl::OUString aURL( m_pTrustFileLocLB->GetEntry( i ) );
+            OUString aURL( m_pTrustFileLocLB->GetEntry( i ) );
             osl::FileBase::getFileURLFromSystemPath( aURL, aURL );
             aSecureURLs[ i ] = aURL;
         }
@@ -428,7 +428,7 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
     // Trusted Path could not be removed (#i33584#)
     // don't forget to remove the old saved SecureURLs
     else
-        mpDlg->maSecOptions.SetSecureURLs( css::uno::Sequence< rtl::OUString >() );
+        mpDlg->maSecOptions.SetSecureURLs( css::uno::Sequence< OUString >() );
 
     mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors );
 }
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 817ec2be3712..defcae055dd0 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -84,7 +84,7 @@ namespace XmlSec
     pair< OUString, OUString> GetDNForCertDetailsView( const OUString & rRawString)
     {
         vector< pair< OUString, OUString > > vecAttrValueOfDN = parseDN(rRawString);
-        ::rtl::OUStringBuffer s1, s2;
+        OUStringBuffer s1, s2;
         OUString sEqual(" = ");
         typedef vector< pair < OUString, OUString > >::const_iterator CIT;
         for (CIT i = vecAttrValueOfDN.begin(); i < vecAttrValueOfDN.end(); ++i)
@@ -117,7 +117,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         bool bInType = true;
         sal_Int32 nTypeNameStart = 0;
         OUString sType;
-        ::rtl::OUStringBuffer sbufValue;
+        OUStringBuffer sbufValue;
         sal_Int32 length = rRawString.getLength();
 
         for (sal_Int32 i = 0; i < length; i++)
@@ -203,7 +203,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         bool bInType = true;
         sal_Int32 nTypeNameStart = 0;
         OUString sType;
-        ::rtl::OUStringBuffer sbufValue;
+        OUStringBuffer sbufValue;
         sal_Int32 length = rRawString.getLength();
 
         for (sal_Int32 i = 0; i < length; i++)
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index d23c656872a9..2e10b880b2ce 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -41,10 +41,10 @@ namespace XmlSec
     OUString        GetDateTimeString( const ::com::sun::star::util::DateTime& _rDT );
     OUString        GetDateString( const ::com::sun::star::util::DateTime& _rDT );
 
-    std::vector< std::pair< ::rtl::OUString, ::rtl::OUString> >
-        parseDN(const ::rtl::OUString& rRawString);
-    std::pair< ::rtl::OUString, ::rtl::OUString> GetDNForCertDetailsView(
-        const ::rtl::OUString & rRawString);
+    std::vector< std::pair< OUString, OUString> >
+        parseDN(const OUString& rRawString);
+    std::pair< OUString, OUString> GetDNForCertDetailsView(
+        const OUString & rRawString);
     OUString        GetContentPart( const OUString& _rRawString );
 
     OUString        GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index 974ddb9ddce7..eabf2a684aa1 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -223,7 +223,7 @@ void BufferNode::setBlocker(const ElementMark* pBlocker)
     }
 }
 
-rtl::OUString BufferNode::printChildren() const
+OUString BufferNode::printChildren() const
 /****** BufferNode/printChildren *********************************************
  *
  *   NAME
@@ -246,39 +246,39 @@ rtl::OUString BufferNode::printChildren() const
  *  Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    rtl::OUString rc;
+    OUString rc;
     std::vector< const ElementCollector* >::const_iterator ii = m_vElementCollectors.begin();
 
     for( ; ii != m_vElementCollectors.end() ; ++ii )
     {
-        rc += rtl::OUString( "BufID=" );
-        rc += rtl::OUString::valueOf((*ii)->getBufferId());
+        rc += OUString( "BufID=" );
+        rc += OUString::valueOf((*ii)->getBufferId());
 
         if (((ElementCollector*)(*ii))->getModify())
         {
-            rc += rtl::OUString( "[M]" );
+            rc += OUString( "[M]" );
         }
 
-        rc += rtl::OUString( ",Pri=" );
+        rc += OUString( ",Pri=" );
 
         switch (((ElementCollector*)(*ii))->getPriority())
         {
             case cssxc::sax::ElementMarkPriority_BEFOREMODIFY:
-                rc += rtl::OUString( "BEFOREMODIFY" );
+                rc += OUString( "BEFOREMODIFY" );
                 break;
             case cssxc::sax::ElementMarkPriority_AFTERMODIFY:
-                rc += rtl::OUString( "AFTERMODIFY" );
+                rc += OUString( "AFTERMODIFY" );
                 break;
             default:
-                rc += rtl::OUString( "UNKNOWN" );
+                rc += OUString( "UNKNOWN" );
                 break;
         }
 
-        rc += rtl::OUString( "(" );
-        rc += rtl::OUString( "SecID=" );
-        rc += rtl::OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId());
-        rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
-        rc += rtl::OUString( " " );
+        rc += OUString( "(" );
+        rc += OUString( "SecID=" );
+        rc += OUString::valueOf(((ElementCollector*)(*ii))->getSecurityId());
+        rc += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
+        rc += OUString( " " );
     }
 
     return rc;
diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx
index fb68f036b0e9..8685d7f6282a 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -93,7 +93,7 @@ public:
     void removeElementCollector(const ElementCollector* pElementCollector);
     ElementMark* getBlocker() const;
     void setBlocker(const ElementMark* pBlocker);
-    rtl::OUString printChildren() const;
+    OUString printChildren() const;
     bool hasAnything() const;
     bool hasChildren() const;
     std::vector< const BufferNode* >* getChildren() const;
diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx
index 35d032b15bd8..512c9c79bffa 100644
--- a/xmlsecurity/source/framework/decryptorimpl.cxx
+++ b/xmlsecurity/source/framework/decryptorimpl.cxx
@@ -165,7 +165,7 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
-    rtl::OUString ouTempString;
+    OUString ouTempString;
 
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
@@ -176,24 +176,24 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg
     aArguments[4] >>= m_xXMLEncryption;
 }
 
-rtl::OUString DecryptorImpl_getImplementationName ()
+OUString DecryptorImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -205,17 +205,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL DecryptorImpl::getImplementationName(  )
+OUString SAL_CALL DecryptorImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return DecryptorImpl_getImplementationName();
 }
-sal_Bool SAL_CALL DecryptorImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL DecryptorImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return DecryptorImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return DecryptorImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx
index 04c9bd030ecd..1a9b110a7fae 100644
--- a/xmlsecurity/source/framework/decryptorimpl.hxx
+++ b/xmlsecurity/source/framework/decryptorimpl.hxx
@@ -85,21 +85,21 @@ public:
         throw (com::sun::star::uno::Exception, 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 DecryptorImpl_getImplementationName()
+OUString DecryptorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL DecryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL DecryptorImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx
index 7565fc8894fa..00d10dedc901 100644
--- a/xmlsecurity/source/framework/encryptionengine.cxx
+++ b/xmlsecurity/source/framework/encryptionengine.cxx
@@ -112,7 +112,7 @@ void EncryptionEngine::tryToPerform( )
 {
     if (checkReady())
     {
-        const rtl::OUString sEncryptionTemplate (
+        const OUString sEncryptionTemplate (
             RTL_CONSTASCII_USTRINGPARAM( ENCRYPTION_TEMPLATE ) );
         cssu::Reference < cssxc::XXMLEncryptionTemplate > xEncryptionTemplate(
             mxMSF->createInstance( sEncryptionTemplate ), cssu::UNO_QUERY );
diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx
index 8d1f3e899181..a83281fa3da2 100644
--- a/xmlsecurity/source/framework/encryptorimpl.cxx
+++ b/xmlsecurity/source/framework/encryptorimpl.cxx
@@ -199,7 +199,7 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
-    rtl::OUString ouTempString;
+    OUString ouTempString;
 
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
@@ -211,24 +211,24 @@ void SAL_CALL EncryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg
 }
 
 
-rtl::OUString EncryptorImpl_getImplementationName ()
+OUString EncryptorImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -241,17 +241,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL EncryptorImpl_createInstance(
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL EncryptorImpl::getImplementationName(  )
+OUString SAL_CALL EncryptorImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return EncryptorImpl_getImplementationName();
 }
-sal_Bool SAL_CALL EncryptorImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return EncryptorImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return EncryptorImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx
index 0aaedd48b5a2..572dc61f2f18 100644
--- a/xmlsecurity/source/framework/encryptorimpl.hxx
+++ b/xmlsecurity/source/framework/encryptorimpl.hxx
@@ -99,21 +99,21 @@ public:
         throw (com::sun::star::uno::Exception, 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 EncryptorImpl_getImplementationName()
+OUString EncryptorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL EncryptorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL EncryptorImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index d0d42fae4e1e..e5da48beafba 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -310,7 +310,7 @@ void SAXEventKeeperImpl::removeElementMarkBuffer(sal_Int32 nId)
     }
 }
 
-rtl::OUString SAXEventKeeperImpl::printBufferNode(
+OUString SAXEventKeeperImpl::printBufferNode(
     BufferNode* pBufferNode, sal_Int32 nIndent) const
 /****** SAXEventKeeperImpl/printBufferNode ***********************************
  *
@@ -344,48 +344,48 @@ rtl::OUString SAXEventKeeperImpl::printBufferNode(
  *  Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    rtl::OUString rc;
+    OUString rc;
 
     for ( int i=0; i<nIndent; ++i )
     {
-        rc += rtl::OUString( " " );
+        rc += OUString( " " );
     }
 
     if (pBufferNode == m_pCurrentBufferNode)
     {
-        rc += rtl::OUString( "[%]" );
+        rc += OUString( "[%]" );
     }
 
     if (pBufferNode == m_pCurrentBlockingBufferNode)
     {
-        rc += rtl::OUString( "[B]" );
+        rc += OUString( "[B]" );
     }
 
-    rc += rtl::OUString( " " );
+    rc += OUString( " " );
     rc += m_xXMLDocument->getNodeName(pBufferNode->getXMLElement());
 
     BufferNode* pParent = (BufferNode*)pBufferNode->getParent();
     if (pParent != NULL)
     {
-        rc += rtl::OUString( "[" );
+        rc += OUString( "[" );
         rc += m_xXMLDocument->getNodeName(pParent->getXMLElement());
-        rc += rtl::OUString( "]" );
+        rc += OUString( "]" );
     }
 
-    rc += rtl::OUString( ":EC=" );
+    rc += OUString( ":EC=" );
     rc += pBufferNode->printChildren();
-    rc += rtl::OUString( " BR=" );
+    rc += OUString( " BR=" );
 
     ElementMark * pBlocker = pBufferNode->getBlocker();
     if (pBlocker != NULL)
     {
-        rc += rtl::OUString::valueOf( pBlocker->getBufferId() );
-        rc += rtl::OUString( "(SecId=" );
-        rc += rtl::OUString::valueOf( pBlocker->getSecurityId() );
-        rc += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
-        rc += rtl::OUString( " " );
+        rc += OUString::valueOf( pBlocker->getBufferId() );
+        rc += OUString( "(SecId=" );
+        rc += OUString::valueOf( pBlocker->getSecurityId() );
+        rc += OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ));
+        rc += OUString( " " );
     }
-    rc += rtl::OUString( "\n" );
+    rc += OUString( "\n" );
 
     std::vector< const BufferNode* >* vChildren = pBufferNode->getChildren();
     std::vector< const BufferNode* >::const_iterator jj = vChildren->begin();
@@ -1051,16 +1051,16 @@ cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextH
     return xOldHandler;
 }
 
-rtl::OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
+OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree()
     throw (cssu::RuntimeException)
 {
-    rtl::OUString rc;
+    OUString rc;
 
-    rc += rtl::OUString( "ElementMarkBuffers: size = " );
-    rc += rtl::OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size());
-    rc += rtl::OUString( "\nCurrentBufferNode: " );
+    rc += OUString( "ElementMarkBuffers: size = " );
+    rc += OUString::valueOf((sal_Int32)m_vElementMarkBuffers.size());
+    rc += OUString( "\nCurrentBufferNode: " );
     rc += m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement());
-    rc += rtl::OUString( "\n" );
+    rc += OUString( "\n" );
     rc += printBufferNode(m_pRootBufferNode, 0);
 
     return rc;
@@ -1191,7 +1191,7 @@ void SAL_CALL SAXEventKeeperImpl::endDocument(  )
 }
 
 void SAL_CALL SAXEventKeeperImpl::startElement(
-    const rtl::OUString& aName,
+    const OUString& aName,
     const cssu::Reference< cssxs::XAttributeList >& xAttribs )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
@@ -1236,7 +1236,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
     }
 }
 
-void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
+void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
         sal_Bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement());
@@ -1293,7 +1293,7 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
     }
 }
 
-void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars )
+void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     if (!m_bIsForwarding)
@@ -1315,14 +1315,14 @@ void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars )
         }
 }
 
-void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const rtl::OUString& aWhitespaces )
+void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     characters( aWhitespaces );
 }
 
 void SAL_CALL SAXEventKeeperImpl::processingInstruction(
-    const rtl::OUString& aTarget, const rtl::OUString& aData )
+    const OUString& aTarget, const OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     if (!m_bIsForwarding)
@@ -1365,24 +1365,24 @@ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >&
     m_pCurrentBufferNode = m_pRootBufferNode;
 }
 
-rtl::OUString SAXEventKeeperImpl_getImplementationName ()
+OUString SAXEventKeeperImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -1395,17 +1395,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SAXEventKeeperImpl::getImplementationName(  )
+OUString SAL_CALL SAXEventKeeperImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return SAXEventKeeperImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return SAXEventKeeperImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return SAXEventKeeperImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index df0ac8b54f6e..deb5e062dc14 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -192,7 +192,7 @@ private:
 
     void removeElementMarkBuffer(sal_Int32 nId);
 
-    rtl::OUString printBufferNode(
+    OUString printBufferNode(
         BufferNode* pBufferNode, sal_Int32 nIndent) const;
 
     com::sun::star::uno::Sequence< com::sun::star::uno::Reference<
@@ -251,7 +251,7 @@ public:
         setNextHandler( const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XDocumentHandler >& xNewHandler )
         throw (com::sun::star::uno::RuntimeException);
-    virtual rtl::OUString SAL_CALL printBufferNodeTree()
+    virtual OUString SAL_CALL printBufferNodeTree()
         throw (com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL
@@ -302,18 +302,18 @@ public:
     virtual void SAL_CALL endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL startElement(
-        const rtl::OUString& aName,
+        const OUString& aName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >&
         xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL characters( const rtl::OUString& aChars )
+    virtual void SAL_CALL characters( const OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL processingInstruction(
-        const rtl::OUString& aTarget, const rtl::OUString& aData )
+        const OUString& aTarget, const OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDocumentLocator(
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
@@ -325,21 +325,21 @@ public:
         throw (com::sun::star::uno::Exception, 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 SAXEventKeeperImpl_getImplementationName()
+OUString SAXEventKeeperImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SAXEventKeeperImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 7550d519aff9..294ad99787c1 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -212,7 +212,7 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
-    rtl::OUString ouTempString;
+    OUString ouTempString;
 
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
@@ -224,24 +224,24 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any
 }
 
 
-rtl::OUString SignatureCreatorImpl_getImplementationName ()
+OUString SignatureCreatorImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -254,17 +254,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SignatureCreatorImpl::getImplementationName(  )
+OUString SAL_CALL SignatureCreatorImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return SignatureCreatorImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return SignatureCreatorImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return SignatureCreatorImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
index 76c841da5f7d..5256d07f0654 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx
@@ -96,21 +96,21 @@ public:
         throw (com::sun::star::uno::Exception, 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 SignatureCreatorImpl_getImplementationName()
+OUString SignatureCreatorImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureCreatorImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index b7f96b2e63f9..1269f4680b01 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -113,7 +113,7 @@ void SignatureEngine::tryToPerform( )
 {
     if (checkReady())
     {
-        const rtl::OUString ouSignatureTemplate (
+        const OUString ouSignatureTemplate (
             RTL_CONSTASCII_USTRINGPARAM( SIGNATURE_TEMPLATE ) );
         cssu::Reference < cssxc::XXMLSignatureTemplate >
             xSignatureTemplate( mxMSF->createInstance( ouSignatureTemplate ), cssu::UNO_QUERY );
@@ -217,7 +217,7 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id )
 
 /* XUriBinding */
 void SAL_CALL SignatureEngine::setUriBinding(
-    const rtl::OUString& uri,
+    const OUString& uri,
     const cssu::Reference< com::sun::star::io::XInputStream >& aInputStream )
     throw (cssu::Exception, cssu::RuntimeException)
 {
@@ -225,7 +225,7 @@ void SAL_CALL SignatureEngine::setUriBinding(
     m_vXInputStreams.push_back(aInputStream);
 }
 
-cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const rtl::OUString& uri )
+cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri )
     throw (cssu::Exception, cssu::RuntimeException)
 {
     cssu::Reference< com::sun::star::io::XInputStream > xInputStream;
diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx
index bfde8fe93860..7844269977c0 100644
--- a/xmlsecurity/source/framework/signatureengine.hxx
+++ b/xmlsecurity/source/framework/signatureengine.hxx
@@ -82,7 +82,7 @@ protected:
      * the m_vUris is used to hold the Uri strings, and the m_vXInputStreams is used
      * to hold corresponding binded XInputStream interface.
      */
-    std::vector< rtl::OUString > m_vUris;
+    std::vector< OUString > m_vUris;
     std::vector< com::sun::star::uno::Reference<
         com::sun::star::io::XInputStream > > m_vXInputStreams;
 
@@ -115,12 +115,12 @@ public:
 
     /* XUriBinding */
     virtual void SAL_CALL setUriBinding(
-        const rtl::OUString& uri,
+        const OUString& uri,
         const com::sun::star::uno::Reference<
             com::sun::star::io::XInputStream >& aInputStream )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
-        SAL_CALL getUriBinding( const rtl::OUString& uri )
+        SAL_CALL getUriBinding( const OUString& uri )
         throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
 };
 
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index c680e32d57f6..f24d8bc35e4b 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -158,7 +158,7 @@ void SAL_CALL SignatureVerifierImpl::initialize(
 {
     OSL_ASSERT(aArguments.getLength() == 5);
 
-    rtl::OUString ouTempString;
+    OUString ouTempString;
 
     aArguments[0] >>= ouTempString;
     m_nSecurityId = ouTempString.toInt32();
@@ -170,25 +170,25 @@ void SAL_CALL SignatureVerifierImpl::initialize(
 }
 
 
-rtl::OUString SignatureVerifierImpl_getImplementationName ()
+OUString SignatureVerifierImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString(
+    return OUString(
         RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -201,17 +201,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SignatureVerifierImpl::getImplementationName(  )
+OUString SAL_CALL SignatureVerifierImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return SignatureVerifierImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return SignatureVerifierImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return SignatureVerifierImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx
index a021d61206d2..bc46c23a6648 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx
@@ -85,21 +85,21 @@ public:
         throw (com::sun::star::uno::Exception, 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 SignatureVerifierImpl_getImplementationName()
+OUString SignatureVerifierImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SignatureVerifierImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 7c0f75053d78..6fde83aefb24 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -24,7 +24,6 @@
 using namespace ::com::sun::star::uno ;
 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::crypto::XXMLEncryptionTemplate ;
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index 0bd4c305a863..6084c1f2abb7 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -79,18 +79,18 @@ class XMLEncryptionTemplateImpl : 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/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 9a654335b6fb..15cb47c18268 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -25,7 +25,6 @@
 using namespace ::com::sun::star::uno ;
 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::crypto::XXMLSignatureTemplate ;
diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
index 9da6bfdc885a..87dba97b1efc 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx
@@ -89,18 +89,18 @@ class XMLSignatureTemplateImpl : 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/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 2d7a921cc893..7d1fdd56027e 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -32,11 +32,10 @@
 #include "rtl/uri.hxx"
 
 using namespace ::com::sun::star::uno;
-using rtl::OUString;
 
 namespace
 {
-::rtl::OUString getElement(::rtl::OUString const & version, ::sal_Int32 * index)
+OUString getElement(OUString const & version, ::sal_Int32 * index)
 {
     while (*index < version.getLength() && version[*index] == '0') {
         ++*index;
@@ -49,11 +48,11 @@ namespace
 // Return 1 if version1 is greater then version 2, 0 if they are equal
 //and -1 if version1 is less version 2
 int compareVersions(
-    ::rtl::OUString const & version1, ::rtl::OUString const & version2)
+    OUString const & version1, OUString const & version2)
 {
     for (::sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0;) {
-        ::rtl::OUString e1(getElement(version1, &i1));
-        ::rtl::OUString e2(getElement(version2, &i2));
+        OUString e1(getElement(version1, &i1));
+        OUString e2(getElement(version2, &i2));
         if (e1.getLength() < e2.getLength()) {
             return -1;
         } else if (e1.getLength() > e2.getLength()) {
@@ -76,18 +75,18 @@ int compareVersions(
 //If 'bSigning' is false, then we validate. If the user enabled validating according to OOo 3.0
 //then mimetype and all content of META-INF must be excluded.
 void ImplFillElementList(
-    std::vector< rtl::OUString >& rList, const Reference < css::embed::XStorage >& rxStore,
-    const ::rtl::OUString rRootStorageName, const bool bRecursive,
+    std::vector< OUString >& rList, const Reference < css::embed::XStorage >& rxStore,
+    const OUString rRootStorageName, const bool bRecursive,
     const DocumentSignatureAlgorithm mode)
 {
-    ::rtl::OUString aMetaInfName(  "META-INF"  );
-    ::rtl::OUString sMimeTypeName ("mimetype");
-    ::rtl::OUString aSep(  "/"  );
+    OUString aMetaInfName(  "META-INF"  );
+    OUString sMimeTypeName ("mimetype");
+    OUString aSep(  "/"  );
 
     Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY );
-    Sequence< ::rtl::OUString > aElements = xElements->getElementNames();
+    Sequence< OUString > aElements = xElements->getElementNames();
     sal_Int32 nElements = aElements.getLength();
-    const ::rtl::OUString* pNames = aElements.getConstArray();
+    const OUString* pNames = aElements.getConstArray();
 
     for ( sal_Int32 n = 0; n < nElements; n++ )
     {
@@ -99,11 +98,11 @@ void ImplFillElementList(
         }
         else
         {
-            ::rtl::OUString sEncName = ::rtl::Uri::encode(
+            OUString sEncName = ::rtl::Uri::encode(
                 pNames[n], rtl_UriCharClassRelSegment,
                 rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8);
             if (sEncName.isEmpty() && !pNames[n].isEmpty())
-                throw css::uno::Exception(::rtl::OUString(
+                throw css::uno::Exception(OUString(
                 "Failed to encode element name of XStorage"), 0);
 
             if ( rxStore->isStreamElement( pNames[n] ) )
@@ -112,13 +111,13 @@ void ImplFillElementList(
                 if (pNames[n].equals(
                     DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()))
                     continue;
-                ::rtl::OUString aFullName( rRootStorageName + sEncName );
+                OUString aFullName( rRootStorageName + sEncName );
                 rList.push_back(aFullName);
             }
             else if ( bRecursive && rxStore->isStorageElement( pNames[n] ) )
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( pNames[n], css::embed::ElementModes::READ );
-                rtl::OUString aFullRootName( rRootStorageName + sEncName + aSep );
+                OUString aFullRootName( rRootStorageName + sEncName + aSep );
                 ImplFillElementList(rList, xSubStore, aFullRootName, bRecursive, mode);
             }
         }
@@ -126,7 +125,7 @@ void ImplFillElementList(
 }
 
 
-bool DocumentSignatureHelper::isODFPre_1_2(const ::rtl::OUString & sVersion)
+bool DocumentSignatureHelper::isODFPre_1_2(const OUString & sVersion)
 {
     //The property version exists only if the document is at least version 1.2
     //That is, if the document has version 1.1 and sVersion is empty.
@@ -138,7 +137,7 @@ bool DocumentSignatureHelper::isODFPre_1_2(const ::rtl::OUString & sVersion)
 
 bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & sigInfo)
 {
-    ::rtl::OUString sManifestURI("META-INF/manifest.xml");
+    OUString sManifestURI("META-INF/manifest.xml");
     bool bOOo3_2 = false;
     typedef ::std::vector< SignatureReferenceInformation >::const_iterator CIT;
     for (CIT i = sigInfo.vSignatureReferenceInfors.begin();
@@ -155,7 +154,7 @@ bool DocumentSignatureHelper::isOOo3_2_Signature(const SignatureInformation & si
 
 DocumentSignatureAlgorithm
 DocumentSignatureHelper::getDocumentAlgorithm(
-    const ::rtl::OUString & sODFVersion, const SignatureInformation & sigInfo)
+    const OUString & sODFVersion, const SignatureInformation & sigInfo)
 {
     OSL_ASSERT(!sODFVersion.isEmpty());
     DocumentSignatureAlgorithm mode = OOo3_2Document;
@@ -184,14 +183,14 @@ DocumentSignatureHelper::getDocumentAlgorithm(
 //
 //When a signature is created then we always use the latest algorithm. That is, we use
 //that of OOo 3.2
-std::vector< rtl::OUString >
+std::vector< OUString >
 DocumentSignatureHelper::CreateElementList(
     const Reference < css::embed::XStorage >& rxStore,
-    const ::rtl::OUString /*rRootStorageName*/, DocumentSignatureMode eMode,
+    const OUString /*rRootStorageName*/, DocumentSignatureMode eMode,
     const DocumentSignatureAlgorithm mode)
 {
-    std::vector< rtl::OUString > aElements;
-    ::rtl::OUString aSep(  "/"  );
+    std::vector< OUString > aElements;
+    OUString aSep(  "/"  );
 
     switch ( eMode )
     {
@@ -200,10 +199,10 @@ DocumentSignatureHelper::CreateElementList(
             if (mode == OOo2Document) //that is, ODF 1.0, 1.1
             {
                 // 1) Main content
-                ImplFillElementList(aElements, rxStore, ::rtl::OUString(), false, mode);
+                ImplFillElementList(aElements, rxStore, OUString(), false, mode);
 
                 // 2) Pictures...
-                rtl::OUString aSubStorageName( "Pictures" );
+                OUString aSubStorageName( "Pictures" );
                 try
                 {
                     Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -214,7 +213,7 @@ DocumentSignatureHelper::CreateElementList(
                     ; // Doesn't have to exist...
                 }
                 // 3) OLE....
-                aSubStorageName = rtl::OUString("ObjectReplacements");
+                aSubStorageName = OUString("ObjectReplacements");
                 try
                 {
                     Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -222,11 +221,11 @@ DocumentSignatureHelper::CreateElementList(
                     xSubStore.clear();
 
                     // Object folders...
-                    rtl::OUString aMatchStr( "Object " );
+                    OUString aMatchStr( "Object " );
                     Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY );
-                    Sequence< ::rtl::OUString > aElementNames = xElements->getElementNames();
+                    Sequence< OUString > aElementNames = xElements->getElementNames();
                     sal_Int32 nElements = aElementNames.getLength();
-                    const ::rtl::OUString* pNames = aElementNames.getConstArray();
+                    const OUString* pNames = aElementNames.getConstArray();
                     for ( sal_Int32 n = 0; n < nElements; n++ )
                     {
                         if ( ( pNames[n].match( aMatchStr ) ) && rxStore->isStorageElement( pNames[n] ) )
@@ -244,14 +243,14 @@ DocumentSignatureHelper::CreateElementList(
             else
             {
                 // Everything except META-INF
-                ImplFillElementList(aElements, rxStore, ::rtl::OUString(), true, mode);
+                ImplFillElementList(aElements, rxStore, OUString(), true, mode);
             }
         }
         break;
         case SignatureModeMacros:
         {
             // 1) Macros
-            rtl::OUString aSubStorageName( "Basic" );
+            OUString aSubStorageName( "Basic" );
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -263,7 +262,7 @@ DocumentSignatureHelper::CreateElementList(
             }
 
             // 2) Dialogs
-            aSubStorageName = rtl::OUString("Dialogs") ;
+            aSubStorageName = OUString("Dialogs") ;
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -274,7 +273,7 @@ DocumentSignatureHelper::CreateElementList(
                 ; // Doesn't have to exist...
             }
             // 3) Scripts
-            aSubStorageName = rtl::OUString("Scripts") ;
+            aSubStorageName = OUString("Scripts") ;
             try
             {
                 Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ );
@@ -289,7 +288,7 @@ DocumentSignatureHelper::CreateElementList(
         case SignatureModePackage:
         {
             // Everything except META-INF
-            ImplFillElementList(aElements, rxStore, ::rtl::OUString(), true, mode);
+            ImplFillElementList(aElements, rxStore, OUString(), true, mode);
         }
         break;
     }
@@ -308,11 +307,11 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
 
     try
     {
-        ::rtl::OUString aSIGStoreName(  "META-INF"  );
+        OUString aSIGStoreName(  "META-INF"  );
         aHelper.xSignatureStorage = rxStore->openStorageElement( aSIGStoreName, nSubStorageOpenMode );
         if ( aHelper.xSignatureStorage.is() )
         {
-            ::rtl::OUString aSIGStreamName;
+            OUString aSIGStreamName;
             if ( eDocSigMode == SignatureModeDocumentContent )
                 aSIGStreamName = DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName();
             else if ( eDocSigMode == SignatureModeMacros )
@@ -338,7 +337,7 @@ SignatureStreamHelper DocumentSignatureHelper::OpenSignatureStream(
 //the uri s in the Reference elements in the signature, were not properly encoded.
 // For example: <Reference URI="ObjectReplacements/Object 1">
 bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
-    const ::std::vector< ::rtl::OUString > & sElementList,
+    const ::std::vector< OUString > & sElementList,
     const SignatureInformation & sigInfo,
     const DocumentSignatureAlgorithm alg)
 {
@@ -350,7 +349,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
         // There is also an extra entry of type TYPE_SAMEDOCUMENT_REFERENCE because of signature date.
         if ( ( rInf.nType == TYPE_BINARYSTREAM_REFERENCE ) || ( rInf.nType == TYPE_XMLSTREAM_REFERENCE ) )
         {
-            ::rtl::OUString sReferenceURI = rInf.ouURI;
+            OUString sReferenceURI = rInf.ouURI;
             if (alg == OOo2Document)
             {
                 //Comparing URIs is a difficult. Therefore we kind of normalize
@@ -362,10 +361,10 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
             }
 
             //find the file in the element list
-            typedef ::std::vector< ::rtl::OUString >::const_iterator CIT;
+            typedef ::std::vector< OUString >::const_iterator CIT;
             for (CIT aIter = sElementList.begin(); aIter != sElementList.end(); ++aIter)
             {
-                ::rtl::OUString sElementListURI = *aIter;
+                OUString sElementListURI = *aIter;
                 if (alg == OOo2Document)
                 {
                     sElementListURI =
@@ -433,19 +432,19 @@ bool DocumentSignatureHelper::equalsReferenceUriManifestPath(
     return retVal;
 }
 
-::rtl::OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()
+OUString DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName()
 {
-    return ::rtl::OUString(  "documentsignatures.xml"  );
+    return OUString(  "documentsignatures.xml"  );
 }
 
-::rtl::OUString DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName()
+OUString DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName()
 {
-    return ::rtl::OUString(  "macrosignatures.xml"  );
+    return OUString(  "macrosignatures.xml"  );
 }
 
-::rtl::OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName()
+OUString DocumentSignatureHelper::GetPackageSignatureDefaultStreamName()
 {
-    return ::rtl::OUString(  "packagesignatures.xml"  );
+    return OUString(  "packagesignatures.xml"  );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 51d8111b787d..6aeb9965ec79 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -68,14 +68,14 @@ bool XMLSignatureHelper::Init()
     mxSEInitializer = com::sun::star::xml::crypto::SEInitializer::create( mxCtx );
 
     if ( mxSEInitializer.is() )
-        mxSecurityContext = mxSEInitializer->createSecurityContext( ::rtl::OUString() );
+        mxSecurityContext = mxSEInitializer->createSecurityContext( OUString() );
 
     return mxSecurityContext.is();
 }
 
 void XMLSignatureHelper::SetStorage(
     const Reference < css::embed::XStorage >& rxStorage,
-    ::rtl::OUString sODFVersion)
+    OUString sODFVersion)
 {
     DBG_ASSERT( !mxUriBinding.is(), "SetStorage - UriBinding already set!" );
     mxUriBinding = new UriBindingHelper( rxStorage );
@@ -110,9 +110,9 @@ sal_Int32 XMLSignatureHelper::GetNewSecurityId()
 
 void XMLSignatureHelper::SetX509Certificate(
         sal_Int32 nSecurityId,
-        const rtl::OUString& ouX509IssuerName,
-        const rtl::OUString& ouX509SerialNumber,
-        const rtl::OUString& ouX509Cert)
+        const OUString& ouX509IssuerName,
+        const OUString& ouX509SerialNumber,
+        const OUString& ouX509Cert)
 {
     mpXSecController->setX509Certificate(
         nSecurityId,
@@ -134,7 +134,7 @@ void XMLSignatureHelper::SetDateTime( sal_Int32 nSecurityId, const Date& rDate,
     mpXSecController->setDate( nSecurityId, stDateTime );
 }
 
-void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool bBinary )
+void XMLSignatureHelper::AddForSigning( sal_Int32 nSecurityId, const OUString& uri, const OUString& objectURL, sal_Bool bBinary )
 {
     mpXSecController->signAStream( nSecurityId, uri, objectURL, bBinary );
 }
@@ -157,17 +157,17 @@ uno::Reference<xml::sax::XWriter> XMLSignatureHelper::CreateDocumentHandlerWithH
     /*
      * write the xml context for signatures
      */
-    rtl::OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES);
+    OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES);
 
     SvXMLAttributeList *pAttributeList = new SvXMLAttributeList();
-    rtl::OUString sNamespace;
+    OUString sNamespace;
     if (mbODFPre1_2)
-        sNamespace = rtl::OUString(NS_DOCUMENTSIGNATURES);
+        sNamespace = OUString(NS_DOCUMENTSIGNATURES);
     else
-        sNamespace = rtl::OUString(NS_DOCUMENTSIGNATURES_ODF_1_2);
+        sNamespace = OUString(NS_DOCUMENTSIGNATURES_ODF_1_2);
 
     pAttributeList->AddAttribute(
-        rtl::OUString(ATTR_XMLNS),
+        OUString(ATTR_XMLNS),
         sNamespace);
 
     xSaxWriter->startDocument();
@@ -180,7 +180,7 @@ uno::Reference<xml::sax::XWriter> XMLSignatureHelper::CreateDocumentHandlerWithH
 
 void XMLSignatureHelper::CloseDocumentHandler( const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler )
 {
-    rtl::OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES);
+    OUString tag_AllSignatures(TAG_DOCUMENTSIGNATURES);
     xDocumentHandler->endElement( tag_AllSignatures );
     xDocumentHandler->endDocument();
 }
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index edc6ee371301..d8b35863a73f 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -84,10 +84,10 @@ void SAL_CALL ImplXMLSignatureListener::endDocument(  )
     }
 }
 
-void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
+void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
-    if ( aName == rtl::OUString("Signature") )
+    if ( aName == OUString("Signature") )
     {
             maStartVerifySignatureElementListener.Call( (void*)&xAttribs );
     }
@@ -98,7 +98,7 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const rtl::OUString& aName
     }
 }
 
-void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName )
+void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
     if (m_xNextHandler.is())
@@ -107,7 +107,7 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const rtl::OUString& aName )
     }
 }
 
-void SAL_CALL ImplXMLSignatureListener::characters( const rtl::OUString& aChars )
+void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
     if (m_xNextHandler.is())
@@ -116,7 +116,7 @@ void SAL_CALL ImplXMLSignatureListener::characters( const rtl::OUString& aChars
     }
 }
 
-void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const rtl::OUString& aWhitespaces )
+void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWhitespaces )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
     if (m_xNextHandler.is())
@@ -125,7 +125,7 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const rtl::OUString
     }
 }
 
-void SAL_CALL ImplXMLSignatureListener::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& aTarget, const OUString& aData )
     throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException)
 {
     if (m_xNextHandler.is())
@@ -157,12 +157,12 @@ UriBindingHelper::UriBindingHelper( const com::sun::star::uno::Reference < com::
 }
 
 
-void SAL_CALL UriBindingHelper::setUriBinding( const rtl::OUString& /*uri*/, const uno::Reference< io::XInputStream >&)
+void SAL_CALL UriBindingHelper::setUriBinding( const OUString& /*uri*/, const uno::Reference< io::XInputStream >&)
     throw (uno::Exception, uno::RuntimeException)
 {
 }
 
-uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const rtl::OUString& uri )
+uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const OUString& uri )
     throw (uno::Exception, uno::RuntimeException)
 {
     uno::Reference< io::XInputStream > xInputStream;
@@ -182,7 +182,7 @@ uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( con
     return xInputStream;
 }
 
-uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno::Reference < embed::XStorage >& rxStore, const rtl::OUString& rURI )
+uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno::Reference < embed::XStorage >& rxStore, const OUString& rURI )
 {
     OSL_ASSERT(!rURI.isEmpty());
     uno::Reference < io::XInputStream > xInStream;
@@ -192,10 +192,10 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno
     {
         // Cloning because of I can't keep all storage references open
         // MBA with think about a better API...
-        const ::rtl::OUString sName = ::rtl::Uri::decode(
+        const OUString sName = ::rtl::Uri::decode(
             rURI, rtl_UriDecodeStrict, rtl_UriCharClassRelSegment);
         if (sName.isEmpty() && !rURI.isEmpty())
-            throw uno::Exception(::rtl::OUString(
+            throw uno::Exception(OUString(
             "Could not decode URI for stream element."), 0);
 
         uno::Reference< io::XStream > xStream;
@@ -206,14 +206,14 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno
     }
     else
     {
-        const rtl::OUString aStoreName = ::rtl::Uri::decode(
+        const OUString aStoreName = ::rtl::Uri::decode(
             rURI.copy( 0, nSepPos ), rtl_UriDecodeStrict, rtl_UriCharClassRelSegment);
         if (aStoreName.isEmpty() && !rURI.isEmpty())
             throw uno::Exception(
-            ::rtl::OUString(
+            OUString(
             "Could not decode URI for stream element."), 0);
 
-        rtl::OUString aElement = rURI.copy( nSepPos+1 );
+        OUString aElement = rURI.copy( nSepPos+1 );
         uno::Reference < embed::XStorage > xSubStore = rxStore->openStorageElement( aStoreName, embed::ElementModes::READ );
         xInStream = OpenInputStream( xSubStore, aElement );
     }
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index 5cb27a116212..53a216a1dd16 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -70,7 +70,7 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
     // com::sun::star::xml::sax::XDocumentHandler
-    virtual void SAL_CALL startElement( const rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
+    virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL startDocument(  )
@@ -79,16 +79,16 @@ public:
     virtual void SAL_CALL endDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL characters( const rtl::OUString& aChars )
+    virtual void SAL_CALL characters( const OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
@@ -113,13 +113,13 @@ public:
     UriBindingHelper();
     UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage );
 
-    void SAL_CALL setUriBinding( const rtl::OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream )
+    void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream )
         throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
-    com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const rtl::OUString& uri )
+    com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri )
         throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
-    static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const rtl::OUString& rURI );
+    static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const OUString& rURI );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 340f7bda7f7d..733022c43678 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -68,7 +68,7 @@ XSecController::~XSecController()
  */
 /** convert string to number with optional min and max values */
 sal_Bool XSecController::convertNumber( sal_Int32& rValue,
-                                        const rtl::OUString& rString,
+                                        const OUString& rString,
                                         sal_Int32 /*nMin*/, sal_Int32 /*nMax*/ )
 {
     sal_Bool bNeg = sal_False;
@@ -105,7 +105,7 @@ sal_Bool XSecController::convertNumber( sal_Int32& rValue,
 }
 
 /** convert util::DateTime to ISO Date String */
-void XSecController::convertDateTime( ::rtl::OUStringBuffer& rBuffer,
+void XSecController::convertDateTime( OUStringBuffer& rBuffer,
                                 const com::sun::star::util::DateTime& rDateTime )
 {
     rBuffer.append((sal_Int32) rDateTime.Year);
@@ -146,11 +146,11 @@ void XSecController::convertDateTime( ::rtl::OUStringBuffer& rBuffer,
 
 /** convert ISO Date String to util::DateTime */
 sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateTime,
-                                     const ::rtl::OUString& rString )
+                                     const OUString& rString )
 {
     sal_Bool bSuccess = sal_True;
 
-    rtl::OUString aDateStr, aTimeStr, sHundredth;
+    OUString aDateStr, aTimeStr, sHundredth;
     sal_Int32 nPos = rString.indexOf( (sal_Unicode) 'T' );
     sal_Int32 nPos2 = rString.indexOf( (sal_Unicode) ',' );
     if ( nPos >= 0 )
@@ -176,14 +176,14 @@ sal_Bool XSecController::convertDateTime( com::sun::star::util::DateTime& rDateT
             sHundredth = rString.copy(nPos2 + 1);
             sal_Int32 len = sHundredth.getLength();
             if (len == 1)
-                sHundredth += rtl::OUString("0");
+                sHundredth += OUString("0");
             if (len > 2)
                 sHundredth = sHundredth.copy(0, 2);
         }
         else
         {
             aTimeStr = rString.copy(nPos + 1);
-            sHundredth = rtl::OUString("0");
+            sHundredth = OUString("0");
         }
     }
     else
@@ -324,9 +324,9 @@ void XSecController::createXSecComponent( )
  *  Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    rtl::OUString sSAXEventKeeper( SAXEVENTKEEPER_COMPONENT );
-    rtl::OUString sXMLSignature( XMLSIGNATURE_COMPONENT );
-    rtl::OUString sXMLDocument( XMLDOCUMENTWRAPPER_COMPONENT );
+    OUString sSAXEventKeeper( SAXEVENTKEEPER_COMPONENT );
+    OUString sXMLSignature( XMLSIGNATURE_COMPONENT );
+    OUString sXMLDocument( XMLDOCUMENTWRAPPER_COMPONENT );
 
     /*
      * marks all security components are not available.
@@ -644,7 +644,7 @@ void XSecController::initializeSAXChain()
 }
 
 cssu::Reference< com::sun::star::io::XInputStream >
-    XSecController::getObjectInputStream( const rtl::OUString& objectURL )
+    XSecController::getObjectInputStream( const OUString& objectURL )
 /****** XSecController/getObjectInputStream ************************************
  *
  *   NAME
@@ -895,26 +895,26 @@ void XSecController::exportSignature(
     /*
      * defines all element tags in Signature element.
      */
-    rtl::OUString tag_Signature(TAG_SIGNATURE);
-    rtl::OUString tag_SignedInfo(TAG_SIGNEDINFO);
-    rtl::OUString tag_CanonicalizationMethod(TAG_CANONICALIZATIONMETHOD);
-    rtl::OUString tag_SignatureMethod(TAG_SIGNATUREMETHOD);
-    rtl::OUString tag_Reference(TAG_REFERENCE);
-    rtl::OUString tag_Transforms(TAG_TRANSFORMS);
-    rtl::OUString tag_Transform(TAG_TRANSFORM);
-    rtl::OUString tag_DigestMethod(TAG_DIGESTMETHOD);
-    rtl::OUString tag_DigestValue(TAG_DIGESTVALUE);
-    rtl::OUString tag_SignatureValue(TAG_SIGNATUREVALUE);
-    rtl::OUString tag_KeyInfo(TAG_KEYINFO);
-    rtl::OUString tag_X509Data(TAG_X509DATA);
-    rtl::OUString tag_X509IssuerSerial(TAG_X509ISSUERSERIAL);
-    rtl::OUString tag_X509IssuerName(TAG_X509ISSUERNAME);
-    rtl::OUString tag_X509SerialNumber(TAG_X509SERIALNUMBER);
-    rtl::OUString tag_X509Certificate(TAG_X509CERTIFICATE);
-    rtl::OUString tag_Object(TAG_OBJECT);
-    rtl::OUString tag_SignatureProperties(TAG_SIGNATUREPROPERTIES);
-    rtl::OUString tag_SignatureProperty(TAG_SIGNATUREPROPERTY);
-    rtl::OUString tag_Date(TAG_DATE);
+    OUString tag_Signature(TAG_SIGNATURE);
+    OUString tag_SignedInfo(TAG_SIGNEDINFO);
+    OUString tag_CanonicalizationMethod(TAG_CANONICALIZATIONMETHOD);
+    OUString tag_SignatureMethod(TAG_SIGNATUREMETHOD);
+    OUString tag_Reference(TAG_REFERENCE);
+    OUString tag_Transforms(TAG_TRANSFORMS);
+    OUString tag_Transform(TAG_TRANSFORM);
+    OUString tag_DigestMethod(TAG_DIGESTMETHOD);
+    OUString tag_DigestValue(TAG_DIGESTVALUE);
+    OUString tag_SignatureValue(TAG_SIGNATUREVALUE);
+    OUString tag_KeyInfo(TAG_KEYINFO);
+    OUString tag_X509Data(TAG_X509DATA);
+    OUString tag_X509IssuerSerial(TAG_X509ISSUERSERIAL);
+    OUString tag_X509IssuerName(TAG_X509ISSUERNAME);
+    OUString tag_X509SerialNumber(TAG_X509SERIALNUMBER);
+    OUString tag_X509Certificate(TAG_X509CERTIFICATE);
+    OUString tag_Object(TAG_OBJECT);
+    OUString tag_SignatureProperties(TAG_SIGNATUREPROPERTIES);
+    OUString tag_SignatureProperty(TAG_SIGNATUREPROPERTY);
+    OUString tag_Date(TAG_DATE);
 
     const SignatureReferenceInformations& vReferenceInfors = signatureInfo.vSignatureReferenceInfors;
     SvXMLAttributeList *pAttributeList;
@@ -924,14 +924,14 @@ void XSecController::exportSignature(
      */
     pAttributeList = new SvXMLAttributeList();
     pAttributeList->AddAttribute(
-        rtl::OUString(ATTR_XMLNS),
-        rtl::OUString(NS_XMLDSIG));
+        OUString(ATTR_XMLNS),
+        OUString(NS_XMLDSIG));
 
     if (!signatureInfo.ouSignatureId.isEmpty())
     {
         pAttributeList->AddAttribute(
-            rtl::OUString(ATTR_ID),
-            rtl::OUString(signatureInfo.ouSignatureId));
+            OUString(ATTR_ID),
+            OUString(signatureInfo.ouSignatureId));
     }
 
     xDocumentHandler->startElement( tag_Signature, cssu::Reference< cssxs::XAttributeList > (pAttributeList));
@@ -944,16 +944,16 @@ void XSecController::exportSignature(
             /* Write CanonicalizationMethod element */
             pAttributeList = new SvXMLAttributeList();
             pAttributeList->AddAttribute(
-                rtl::OUString(ATTR_ALGORITHM),
-                rtl::OUString(ALGO_C14N));
+                OUString(ATTR_ALGORITHM),
+                OUString(ALGO_C14N));
             xDocumentHandler->startElement( tag_CanonicalizationMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
             xDocumentHandler->endElement( tag_CanonicalizationMethod );
 
             /* Write SignatureMethod element */
             pAttributeList = new SvXMLAttributeList();
             pAttributeList->AddAttribute(
-                rtl::OUString(ATTR_ALGORITHM),
-                rtl::OUString(ALGO_RSASHA1));
+                OUString(ATTR_ALGORITHM),
+                OUString(ALGO_RSASHA1));
             xDocumentHandler->startElement( tag_SignatureMethod, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
             xDocumentHandler->endElement( tag_SignatureMethod );
 
@@ -972,7 +972,7 @@ void XSecController::exportSignature(
                  */
                 {
                     pAttributeList->AddAttribute(
-                        rtl::OUString(ATTR_URI),
+                        OUString(ATTR_URI),
                         refInfor.ouURI);
                 }
                 else
@@ -981,8 +981,8 @@ void XSecController::exportSignature(
                  */
                 {
                     pAttributeList->AddAttribute(
-                        rtl::OUString(ATTR_URI),
-                        rtl::OUString(CHAR_FRAGMENT)+refInfor.ouURI);
+                        OUString(ATTR_URI),
+                        OUString(CHAR_FRAGMENT)+refInfor.ouURI);
                 }
 
                 xDocumentHandler->startElement( tag_Reference, cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -999,8 +999,8 @@ void XSecController::exportSignature(
                         {
                             pAttributeList = new SvXMLAttributeList();
                             pAttributeList->AddAttribute(
-                                rtl::OUString(ATTR_ALGORITHM),
-                                rtl::OUString(ALGO_C14N));
+                                OUString(ATTR_ALGORITHM),
+                                OUString(ALGO_C14N));
                             xDocumentHandler->startElement(
                                 tag_Transform,
                                 cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -1012,8 +1012,8 @@ void XSecController::exportSignature(
                     /* Write DigestMethod element */
                     pAttributeList = new SvXMLAttributeList();
                     pAttributeList->AddAttribute(
-                        rtl::OUString(ATTR_ALGORITHM),
-                        rtl::OUString(ALGO_XMLDSIGSHA1));
+                        OUString(ATTR_ALGORITHM),
+                        OUString(ALGO_XMLDSIGSHA1));
                     xDocumentHandler->startElement(
                         tag_DigestMethod,
                         cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
@@ -1096,11 +1096,11 @@ void XSecController::exportSignature(
                 /* Write SignatureProperty element */
                 pAttributeList = new SvXMLAttributeList();
                 pAttributeList->AddAttribute(
-                    rtl::OUString(ATTR_ID),
+                    OUString(ATTR_ID),
                     signatureInfo.ouPropertyId);
                 pAttributeList->AddAttribute(
-                    rtl::OUString(ATTR_TARGET),
-                    rtl::OUString(CHAR_FRAGMENT)+signatureInfo.ouSignatureId);
+                    OUString(ATTR_TARGET),
+                    OUString(CHAR_FRAGMENT)+signatureInfo.ouSignatureId);
                 xDocumentHandler->startElement(
                     tag_SignatureProperty,
                     cssu::Reference< cssxs::XAttributeList > (pAttributeList));
@@ -1109,18 +1109,18 @@ void XSecController::exportSignature(
 
                     pAttributeList = new SvXMLAttributeList();
                     pAttributeList->AddAttribute(
-                        rtl::OUString(ATTR_XMLNS)
-                            +rtl::OUString(":")
-                            +rtl::OUString(NSTAG_DC),
-                        rtl::OUString(NS_DC));
+                        OUString(ATTR_XMLNS)
+                            +OUString(":")
+                            +OUString(NSTAG_DC),
+                        OUString(NS_DC));
 
                     xDocumentHandler->startElement(
-                        rtl::OUString(NSTAG_DC)
-                            +rtl::OUString(":")
+                        OUString(NSTAG_DC)
+                            +OUString(":")
                             +tag_Date,
                         cssu::Reference< cssxs::XAttributeList > (pAttributeList));
 
-                    ::rtl::OUStringBuffer buffer;
+                    OUStringBuffer buffer;
                     //If the xml signature was already contained in the document,
                     //then we use the original date and time string, rather then the
                     //converted one. When the original string is converted to the DateTime
@@ -1136,8 +1136,8 @@ void XSecController::exportSignature(
                     xDocumentHandler->characters( buffer.makeStringAndClear() );
 
                     xDocumentHandler->endElement(
-                        rtl::OUString(NSTAG_DC)
-                            +rtl::OUString(":")
+                        OUString(NSTAG_DC)
+                            +OUString(":")
                             +tag_Date);
                 }
                 xDocumentHandler->endElement( tag_SignatureProperty );
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 207c36d2bda4..6014807de6bc 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -133,7 +133,7 @@ public:
         xReferenceResolvedListener = xListener;
     }
 
-    void addReference( sal_Int32 type, rtl::OUString uri, sal_Int32 keeperId )
+    void addReference( sal_Int32 type, OUString uri, sal_Int32 keeperId )
     {
         signatureInfor.vSignatureReferenceInfors.push_back(
                 SignatureReferenceInformation(type, uri));
@@ -345,9 +345,9 @@ private:
     /*
      * Common methods
      */
-    sal_Bool convertNumber( sal_Int32& rValue, const rtl::OUString& rString, sal_Int32 nMin, sal_Int32 nMax );
-    void convertDateTime( ::rtl::OUStringBuffer& rBuffer, const com::sun::star::util::DateTime& rDateTime );
-    sal_Bool convertDateTime( com::sun::star::util::DateTime& rDateTime, const ::rtl::OUString& rString );
+    sal_Bool convertNumber( sal_Int32& rValue, const OUString& rString, sal_Int32 nMin, sal_Int32 nMax );
+    void convertDateTime( OUStringBuffer& rBuffer, const com::sun::star::util::DateTime& rDateTime );
+    sal_Bool convertDateTime( com::sun::star::util::DateTime& rDateTime, const OUString& rString );
 
     void createXSecComponent( );
     int findSignatureInfor( sal_Int32 nSecurityId ) const;
@@ -357,14 +357,14 @@ private:
     void initializeSAXChain();
 
     com::sun::star::uno::Reference<
-        com::sun::star::io::XInputStream > getObjectInputStream( const rtl::OUString& objectURL );
+        com::sun::star::io::XInputStream > getObjectInputStream( const OUString& objectURL );
 
         //sal_Int32 getFastPropertyIndex(sal_Int32 nHandle) const;
 
     /*
      * For signature generation
      */
-    rtl::OUString createId();
+    OUString createId();
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToWrite(
         InternalSignatureInformation& signatureInfo );
@@ -373,22 +373,22 @@ private:
      * For signature verification
      */
     void addSignature();
-    void addReference( const rtl::OUString& ouUri);
+    void addReference( const OUString& ouUri);
     void addStreamReference(
-        const rtl::OUString& ouUri,
+        const OUString& ouUri,
         bool isBinary );
     void setReferenceCount() const;
 
-    void setX509IssuerName( rtl::OUString& ouX509IssuerName );
-    void setX509SerialNumber( rtl::OUString& ouX509SerialNumber );
-    void setX509Certificate( rtl::OUString& ouX509Certificate );
-    void setSignatureValue( rtl::OUString& ouSignatureValue );
-    void setDigestValue( rtl::OUString& ouDigestValue );
+    void setX509IssuerName( OUString& ouX509IssuerName );
+    void setX509SerialNumber( OUString& ouX509SerialNumber );
+    void setX509Certificate( OUString& ouX509Certificate );
+    void setSignatureValue( OUString& ouSignatureValue );
+    void setDigestValue( OUString& ouDigestValue );
 
-    void setDate( rtl::OUString& ouDate );
+    void setDate( OUString& ouDate );
 
-    void setId( rtl::OUString& ouId );
-    void setPropertyId( rtl::OUString& ouPropertyId );
+    void setId( OUString& ouId );
+    void setPropertyId( OUString& ouPropertyId );
 
     com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::sax::XReferenceResolvedListener > prepareSignatureToRead(
@@ -428,7 +428,7 @@ public:
     /*
      * For signature generation
      */
-    void signAStream( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& objectURL, sal_Bool isBinary);
+    void signAStream( sal_Int32 securityId, const OUString& uri, const OUString& objectURL, sal_Bool isBinary);
 
 
     /** sets data that describes the certificate.
@@ -451,16 +451,16 @@ public:
      */
     void setX509Certificate(
         sal_Int32 nSecurityId,
-        const rtl::OUString& ouX509IssuerName,
-        const rtl::OUString& ouX509SerialNumber,
-        const rtl::OUString& ouX509Cert);
+        const OUString& ouX509IssuerName,
+        const OUString& ouX509SerialNumber,
+        const OUString& ouX509Cert);
     // see the other setX509Certifcate function
     void setX509Certificate(
         sal_Int32 nSecurityId,
         const sal_Int32 nSecurityEnvironmentIndex,
-        const rtl::OUString& ouX509IssuerName,
-        const rtl::OUString& ouX509SerialNumber,
-        const rtl::OUString& ouX509Cert);
+        const OUString& ouX509IssuerName,
+        const OUString& ouX509SerialNumber,
+        const OUString& ouX509Cert);
 
     void setDate(
         sal_Int32 nSecurityId,
@@ -474,7 +474,7 @@ public:
     /*
      * For signature verification
      */
-    void collectToVerify( const rtl::OUString& referenceId );
+    void collectToVerify( const OUString& referenceId );
     void addSignature( sal_Int32 nSignatureId );
     com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > createSignatureReader();
     void releaseSignatureReader();
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index 547ec823580a..85557a149831 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -38,15 +38,15 @@ XSecParser::XSecParser(
 {
 }
 
-rtl::OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& xAttribs )
+OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& xAttribs )
 {
-    rtl::OUString ouIdAttr = xAttribs->getValueByName(
-        rtl::OUString(RTL_ASCII_USTRINGPARAM("id")));
+    OUString ouIdAttr = xAttribs->getValueByName(
+        OUString(RTL_ASCII_USTRINGPARAM("id")));
 
     if (ouIdAttr == NULL)
     {
         ouIdAttr = xAttribs->getValueByName(
-            rtl::OUString(RTL_ASCII_USTRINGPARAM("Id")));
+            OUString(RTL_ASCII_USTRINGPARAM("Id")));
     }
 
     return ouIdAttr;
@@ -81,19 +81,19 @@ void SAL_CALL XSecParser::endDocument(  )
 }
 
 void SAL_CALL XSecParser::startElement(
-    const rtl::OUString& aName,
+    const OUString& aName,
     const cssu::Reference< cssxs::XAttributeList >& xAttribs )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     try
     {
-        rtl::OUString ouIdAttr = getIdAttr(xAttribs);
+        OUString ouIdAttr = getIdAttr(xAttribs);
         if (ouIdAttr != NULL)
         {
             m_pXSecController->collectToVerify( ouIdAttr );
         }
 
-        if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATURE)) )
+        if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATURE)) )
         {
             m_pXSecController->addSignature();
             if (ouIdAttr != NULL)
@@ -101,9 +101,9 @@ void SAL_CALL XSecParser::startElement(
                 m_pXSecController->setId( ouIdAttr );
             }
         }
-        else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) )
+        else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) )
         {
-            rtl::OUString ouUri = xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(ATTR_URI)));
+            OUString ouUri = xAttribs->getValueByName(OUString(RTL_ASCII_USTRINGPARAM(ATTR_URI)));
             DBG_ASSERT( ouUri != NULL, "URI == NULL" );
 
             if (ouUri.startsWith(CHAR_FRAGMENT))
@@ -122,13 +122,13 @@ void SAL_CALL XSecParser::startElement(
                 m_bReferenceUnresolved = true;
             }
         }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_TRANSFORM)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_TRANSFORM)))
             {
             if ( m_bReferenceUnresolved )
             {
-                rtl::OUString ouAlgorithm = xAttribs->getValueByName(rtl::OUString(RTL_ASCII_USTRINGPARAM(ATTR_ALGORITHM)));
+                OUString ouAlgorithm = xAttribs->getValueByName(OUString(RTL_ASCII_USTRINGPARAM(ATTR_ALGORITHM)));
 
-                if (ouAlgorithm != NULL && ouAlgorithm == rtl::OUString(RTL_ASCII_USTRINGPARAM(ALGO_C14N)))
+                if (ouAlgorithm != NULL && ouAlgorithm == OUString(RTL_ASCII_USTRINGPARAM(ALGO_C14N)))
                 /*
                 * a xml stream
                 */
@@ -138,43 +138,43 @@ void SAL_CALL XSecParser::startElement(
                 }
             }
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME)))
             {
-            m_ouX509IssuerName = rtl::OUString();
+            m_ouX509IssuerName = OUString();
             m_bInX509IssuerName = true;
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER)))
             {
-            m_ouX509SerialNumber = rtl::OUString();
+            m_ouX509SerialNumber = OUString();
             m_bInX509SerialNumber = true;
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE)))
             {
-            m_ouX509Certificate = rtl::OUString();
+            m_ouX509Certificate = OUString();
             m_bInX509Certificate = true;
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)))
             {
-            m_ouSignatureValue = rtl::OUString();
+            m_ouSignatureValue = OUString();
                 m_bInSignatureValue = true;
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
             {
-            m_ouDigestValue = rtl::OUString();
+            m_ouDigestValue = OUString();
                 m_bInDigestValue = true;
             }
-            else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY)) )
+            else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREPROPERTY)) )
         {
             if (ouIdAttr != NULL)
             {
                 m_pXSecController->setPropertyId( ouIdAttr );
             }
         }
-            else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
-                        +rtl::OUString(":")
-                        +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE)))
+            else if (aName == OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
+                        +OUString(":")
+                        +OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE)))
             {
-            m_ouDate = rtl::OUString();
+            m_ouDate = OUString();
                 m_bInDate = true;
             }
 
@@ -187,28 +187,28 @@ void SAL_CALL XSecParser::startElement(
     {//getCaughtException MUST be the first line in the catch block
         cssu::Any exc =  cppu::getCaughtException();
         throw cssxs::SAXException(
-            rtl::OUString(
+            OUString(
                               "xmlsecurity: Exception in XSecParser::startElement"),
             0, exc);
     }
     catch (...)
     {
         throw cssxs::SAXException(
-            rtl::OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0,
+            OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0,
             cssu::Any());
     }
 }
 
-void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
+void SAL_CALL XSecParser::endElement( const OUString& aName )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     try
     {
-        if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
+        if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_DIGESTVALUE)))
             {
                 m_bInDigestValue = false;
             }
-        else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) )
+        else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_REFERENCE)) )
         {
             if ( m_bReferenceUnresolved )
             /*
@@ -221,33 +221,33 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
 
             m_pXSecController->setDigestValue( m_ouDigestValue );
         }
-        else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNEDINFO)) )
+        else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNEDINFO)) )
         {
             m_pXSecController->setReferenceCount();
         }
-        else if ( aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)) )
+        else if ( aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_SIGNATUREVALUE)) )
         {
             m_pXSecController->setSignatureValue( m_ouSignatureValue );
                 m_bInSignatureValue = false;
         }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509ISSUERNAME)))
             {
             m_pXSecController->setX509IssuerName( m_ouX509IssuerName );
             m_bInX509IssuerName = false;
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509SERIALNUMBER)))
             {
             m_pXSecController->setX509SerialNumber( m_ouX509SerialNumber );
             m_bInX509SerialNumber = false;
             }
-            else if (aName == rtl::OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE)))
+            else if (aName == OUString(RTL_ASCII_USTRINGPARAM(TAG_X509CERTIFICATE)))
             {
             m_pXSecController->setX509Certificate( m_ouX509Certificate );
             m_bInX509Certificate = false;
             }
-            else if (aName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
-                        +rtl::OUString(":")
-                        +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE)))
+            else if (aName == OUString(RTL_CONSTASCII_USTRINGPARAM(NSTAG_DC))
+                        +OUString(":")
+                        +OUString(RTL_CONSTASCII_USTRINGPARAM(TAG_DATE)))
         {
             m_pXSecController->setDate( m_ouDate );
                 m_bInDate = false;
@@ -262,19 +262,19 @@ void SAL_CALL XSecParser::endElement( const rtl::OUString& aName )
     {//getCaughtException MUST be the first line in the catch block
         cssu::Any exc =  cppu::getCaughtException();
         throw cssxs::SAXException(
-            rtl::OUString(
+            OUString(
                               "xmlsecurity: Exception in XSecParser::endElement"),
             0, exc);
     }
     catch (...)
     {
         throw cssxs::SAXException(
-            rtl::OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0,
+            OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0,
             cssu::Any());
     }
 }
 
-void SAL_CALL XSecParser::characters( const rtl::OUString& aChars )
+void SAL_CALL XSecParser::characters( const OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     if (m_bInX509IssuerName)
@@ -308,7 +308,7 @@ void SAL_CALL XSecParser::characters( const rtl::OUString& aChars )
         }
 }
 
-void SAL_CALL XSecParser::ignorableWhitespace( const rtl::OUString& aWhitespaces )
+void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     if (m_xNextHandler.is())
@@ -317,7 +317,7 @@ void SAL_CALL XSecParser::ignorableWhitespace( const rtl::OUString& aWhitespaces
         }
 }
 
-void SAL_CALL XSecParser::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     if (m_xNextHandler.is())
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index f5d3fae39f8a..f37df23a8a60 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -58,12 +58,12 @@ private:
      * the following members are used to reserve the signature information,
      * including X509IssuerName, X509SerialNumber, and X509Certificate,etc.
      */
-    rtl::OUString m_ouX509IssuerName;
-    rtl::OUString m_ouX509SerialNumber;
-    rtl::OUString m_ouX509Certificate;
-    rtl::OUString m_ouDigestValue;
-    rtl::OUString m_ouSignatureValue;
-    rtl::OUString m_ouDate;
+    OUString m_ouX509IssuerName;
+    OUString m_ouX509SerialNumber;
+    OUString m_ouX509Certificate;
+    OUString m_ouDigestValue;
+    OUString m_ouSignatureValue;
+    OUString m_ouDate;
 
     /*
      * whether inside a particular element
@@ -93,11 +93,11 @@ private:
      * only after the Transforms element is read in, so we have to reserve the reference's
      * URI when the startElement event is met.
      */
-    rtl::OUString m_currentReferenceURI;
+    OUString m_currentReferenceURI;
     bool m_bReferenceUnresolved;
 
 private:
-    rtl::OUString getIdAttr(const com::sun::star::uno::Reference<
+    OUString getIdAttr(const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList >& xAttribs );
 
 public:
@@ -116,23 +116,23 @@ public:
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL startElement(
-        const rtl::OUString& aName,
+        const OUString& aName,
         const com::sun::star::uno::Reference<
             com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL characters( const rtl::OUString& aChars )
+    virtual void SAL_CALL characters( const OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL processingInstruction(
-        const rtl::OUString& aTarget,
-        const rtl::OUString& aData )
+        const OUString& aTarget,
+        const OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL setDocumentLocator(
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 431c26153891..4fbfb40b2864 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -41,7 +41,7 @@ namespace cssxs = com::sun::star::xml::sax;
 #define SIGNATURECREATOR_COMPONENT "com.sun.star.xml.crypto.sax.SignatureCreator"
 
 /* protected: for signature generation */
-rtl::OUString XSecController::createId()
+OUString XSecController::createId()
 {
     cssu::Sequence< sal_Int8 > aSeq( 16 );
     rtl_createUuid ((sal_uInt8 *)aSeq.getArray(), 0, sal_True);
@@ -53,7 +53,7 @@ rtl::OUString XSecController::createId()
         length += sprintf(str+length, "%04x", (unsigned char)aSeq[i]);
     }
 
-    return rtl::OUString::createFromAscii(str);
+    return OUString::createFromAscii(str);
 }
 
 cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepareSignatureToWrite(
@@ -76,15 +76,15 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
         xMCF->createInstanceWithContext(
-            rtl::OUString(SIGNATURECREATOR_COMPONENT), mxCtx),
+            OUString(SIGNATURECREATOR_COMPONENT), mxCtx),
         cssu::UNO_QUERY);
 
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
 
     cssu::Sequence<cssu::Any> args(5);
-    args[0] = cssu::makeAny(rtl::OUString::valueOf(nSecurityId));
+    args[0] = cssu::makeAny(OUString::valueOf(nSecurityId));
     args[1] = cssu::makeAny(m_xSAXEventKeeper);
-    args[2] = cssu::makeAny(rtl::OUString::valueOf(nIdOfSignatureElementCollector));
+    args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector));
 
     //i39448 : for nss, the internal module is used for signing, which needs to be improved later
     sal_Int32 nEnvIndex = internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex;
@@ -175,15 +175,15 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     for(i=0; i<size; ++i)
     {
         SignatureReferenceInformation& refInfor = vReferenceInfors[i];
-        refInfor.ouDigestValue = rtl::OUString(CHAR_BLANK);
+        refInfor.ouDigestValue = OUString(CHAR_BLANK);
     }
 
-    internalSignatureInfor.signatureInfor.ouSignatureValue = rtl::OUString(CHAR_BLANK);
+    internalSignatureInfor.signatureInfor.ouSignatureValue = OUString(CHAR_BLANK);
 
     return xReferenceResolvedListener;
 }
 
-void XSecController::signAStream( sal_Int32 securityId, const rtl::OUString& uri, const rtl::OUString& /*objectURL*/, sal_Bool isBinary)
+void XSecController::signAStream( sal_Int32 securityId, const OUString& uri, const OUString& /*objectURL*/, sal_Bool isBinary)
 {
         sal_Int32 type = ((isBinary==sal_True)?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE);
 
@@ -203,9 +203,9 @@ void XSecController::signAStream( sal_Int32 securityId, const rtl::OUString& uri
 
 void XSecController::setX509Certificate(
     sal_Int32 nSecurityId,
-    const rtl::OUString& ouX509IssuerName,
-    const rtl::OUString& ouX509SerialNumber,
-    const rtl::OUString& ouX509Cert)
+    const OUString& ouX509IssuerName,
+    const OUString& ouX509SerialNumber,
+    const OUString& ouX509Cert)
 {
     setX509Certificate(nSecurityId, -1, ouX509IssuerName, ouX509SerialNumber, ouX509Cert);
 }
@@ -213,9 +213,9 @@ void XSecController::setX509Certificate(
 void XSecController::setX509Certificate(
     sal_Int32 nSecurityId,
     const sal_Int32 nSecurityEnvironmentIndex,
-    const rtl::OUString& ouX509IssuerName,
-    const rtl::OUString& ouX509SerialNumber,
-    const rtl::OUString& ouX509Cert)
+    const OUString& ouX509IssuerName,
+    const OUString& ouX509SerialNumber,
+    const OUString& ouX509Cert)
 {
     int index = findSignatureInfor( nSecurityId );
 
diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx
index 1b06ec843083..3b559ebe0022 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -61,15 +61,15 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener > XSecController::prepar
     cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() );
     xReferenceResolvedListener = cssu::Reference< cssxc::sax::XReferenceResolvedListener >(
         xMCF->createInstanceWithContext(
-            rtl::OUString( SIGNATUREVERIFIER_COMPONENT ), mxCtx),
+            OUString( SIGNATUREVERIFIER_COMPONENT ), mxCtx),
         cssu::UNO_QUERY);
 
     cssu::Reference<cssl::XInitialization> xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
 
     cssu::Sequence<cssu::Any> args(5);
-    args[0] = cssu::makeAny(rtl::OUString::valueOf(nSecurityId));
+    args[0] = cssu::makeAny(OUString::valueOf(nSecurityId));
     args[1] = cssu::makeAny(m_xSAXEventKeeper);
-    args[2] = cssu::makeAny(rtl::OUString::valueOf(nIdOfSignatureElementCollector));
+    args[2] = cssu::makeAny(OUString::valueOf(nIdOfSignatureElementCollector));
     args[3] = cssu::makeAny(m_xSecurityContext);
     args[4] = cssu::makeAny(m_xXMLSignature);
     xInitialization->initialize(args);
@@ -111,7 +111,7 @@ void XSecController::addSignature()
     m_vInternalSignatureInformations.push_back( isi );
 }
 
-void XSecController::addReference( const rtl::OUString& ouUri)
+void XSecController::addReference( const OUString& ouUri)
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -123,7 +123,7 @@ void XSecController::addReference( const rtl::OUString& ouUri)
 }
 
 void XSecController::addStreamReference(
-    const rtl::OUString& ouUri,
+    const OUString& ouUri,
     bool isBinary )
 {
         sal_Int32 type = (isBinary?TYPE_BINARYSTREAM_REFERENCE:TYPE_XMLSTREAM_REFERENCE);
@@ -188,7 +188,7 @@ void XSecController::setReferenceCount() const
     }
 }
 
-void XSecController::setX509IssuerName( rtl::OUString& ouX509IssuerName )
+void XSecController::setX509IssuerName( OUString& ouX509IssuerName )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -199,7 +199,7 @@ void XSecController::setX509IssuerName( rtl::OUString& ouX509IssuerName )
     isi.signatureInfor.ouX509IssuerName = ouX509IssuerName;
 }
 
-void XSecController::setX509SerialNumber( rtl::OUString& ouX509SerialNumber )
+void XSecController::setX509SerialNumber( OUString& ouX509SerialNumber )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -210,7 +210,7 @@ void XSecController::setX509SerialNumber( rtl::OUString& ouX509SerialNumber )
     isi.signatureInfor.ouX509SerialNumber = ouX509SerialNumber;
 }
 
-void XSecController::setX509Certificate( rtl::OUString& ouX509Certificate )
+void XSecController::setX509Certificate( OUString& ouX509Certificate )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -221,7 +221,7 @@ void XSecController::setX509Certificate( rtl::OUString& ouX509Certificate )
     isi.signatureInfor.ouX509Certificate = ouX509Certificate;
 }
 
-void XSecController::setSignatureValue( rtl::OUString& ouSignatureValue )
+void XSecController::setSignatureValue( OUString& ouSignatureValue )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -232,7 +232,7 @@ void XSecController::setSignatureValue( rtl::OUString& ouSignatureValue )
     isi.signatureInfor.ouSignatureValue = ouSignatureValue;
 }
 
-void XSecController::setDigestValue( rtl::OUString& ouDigestValue )
+void XSecController::setDigestValue( OUString& ouDigestValue )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -250,7 +250,7 @@ void XSecController::setDigestValue( rtl::OUString& ouDigestValue )
     reference.ouDigestValue = ouDigestValue;
 }
 
-void XSecController::setDate( rtl::OUString& ouDate )
+void XSecController::setDate( OUString& ouDate )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -262,7 +262,7 @@ void XSecController::setDate( rtl::OUString& ouDate )
     isi.signatureInfor.ouDateTime = ouDate;
 }
 
-void XSecController::setId( rtl::OUString& ouId )
+void XSecController::setId( OUString& ouId )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -273,7 +273,7 @@ void XSecController::setId( rtl::OUString& ouId )
     isi.signatureInfor.ouSignatureId = ouId;
 }
 
-void XSecController::setPropertyId( rtl::OUString& ouPropertyId )
+void XSecController::setPropertyId( OUString& ouPropertyId )
 {
     if (m_vInternalSignatureInformations.empty())
     {
@@ -285,7 +285,7 @@ void XSecController::setPropertyId( rtl::OUString& ouPropertyId )
 }
 
 /* public: for signature verify */
-void XSecController::collectToVerify( const rtl::OUString& referenceId )
+void XSecController::collectToVerify( const OUString& referenceId )
 {
     /* DBG_ASSERT( m_xSAXEventKeeper.is(), "the SAXEventKeeper is NULL" ); */
 
diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx
index 652e130f845d..ae63a291836d 100644
--- a/xmlsecurity/source/xmlsec/biginteger.cxx
+++ b/xmlsecurity/source/xmlsec/biginteger.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 using namespace ::com::sun::star::uno ;
-using ::rtl::OUString ;
 
 Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral )
 {
@@ -35,7 +34,7 @@ Sequence< sal_Int8 > numericStringToBigInteger ( OUString numeral )
         xmlSecSize length ;
         xmlSecBn bn ;
 
-        rtl::OString onumeral = rtl::OUStringToOString( numeral , RTL_TEXTENCODING_ASCII_US ) ;
+        OString onumeral = OUStringToOString( numeral , RTL_TEXTENCODING_ASCII_US ) ;
 
         chNumeral = xmlStrndup( ( const xmlChar* )onumeral.getStr(), ( int )onumeral.getLength() ) ;
 
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
index f4e270972a12..04736cbc5787 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
@@ -25,7 +25,6 @@
 #endif
 
 using namespace ::com::sun::star::uno ;
-using ::rtl::OUString ;
 
 using ::com::sun::star::security::XCertificateExtension ;
 
diff --git a/xmlsecurity/source/xmlsec/certvalidity.cxx b/xmlsecurity/source/xmlsec/certvalidity.cxx
index dfe46fad3de8..f27dd208de19 100644
--- a/xmlsecurity/source/xmlsec/certvalidity.cxx
+++ b/xmlsecurity/source/xmlsec/certvalidity.cxx
@@ -21,7 +21,6 @@
 #include <xmlsecurity/certvalidity.hxx>
 #include <com/sun/star/security/CertificateValidity.hpp>
 
-using ::rtl::OUString ;
 using namespace ::com::sun::star::security ;
 
 #define VALID_STR "valid certificate"
@@ -42,7 +41,7 @@ using namespace ::com::sun::star::security ;
 #define ROOT_INVALID_STR "invalid root certificate"
 #define CHAIN_INCOMPLETE_STR "invalid certification path"
 
-rtl::OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
+OUString certificateValidityToOUString( ::sal_Int32 certValidity ) {
     OUString aValidity ;
 
     if( certValidity == CertificateValidity::VALID ) {
diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx
index 913c87c7e025..0e24b6dd1cd6 100644
--- a/xmlsecurity/source/xmlsec/diagnose.cxx
+++ b/xmlsecurity/source/xmlsec/diagnose.cxx
@@ -29,9 +29,9 @@ struct UseDiagnose : public rtl::StaticWithInit< bool, UseDiagnose>
 {
     bool operator () () const
     {
-        ::rtl::OUString value;
+        OUString value;
         sal_Bool res = rtl::Bootstrap::get(
-            ::rtl::OUString("XMLSECURITY_TRACE"), value);
+            OUString("XMLSECURITY_TRACE"), value);
         return res == sal_True ? true : false;
     }
 };
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index 1fa81720f00f..29e928ce37ad 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -31,7 +31,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 ;
 
@@ -79,7 +78,7 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno:
                     PCERT_OTHER_NAME pOtherName = pEntry->pOtherName;
 
                     ::com::sun::star::beans::NamedValue otherNameProp;
-                    otherNameProp.Name = ::rtl::OUString::createFromAscii(pOtherName->pszObjId);
+                    otherNameProp.Name = OUString::createFromAscii(pOtherName->pszObjId);
 
                     Sequence< sal_Int8 > otherName( pOtherName->Value.cbData ) ;
                     for( unsigned int n = 0; n < (unsigned int) pOtherName->Value.cbData ; n ++ )
@@ -92,11 +91,11 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno:
                 }
             case CERT_ALT_NAME_RFC822_NAME :
                 arrCertAltNameEntry[i].Type = ExtAltNameType_RFC822_NAME;
-                arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Unicode*)pEntry->pwszRfc822Name);
+                arrCertAltNameEntry[i].Value <<= OUString((const sal_Unicode*)pEntry->pwszRfc822Name);
                 break;
             case CERT_ALT_NAME_DNS_NAME :
                 arrCertAltNameEntry[i].Type = ExtAltNameType_DNS_NAME;
-                arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Unicode*)pEntry->pwszDNSName);
+                arrCertAltNameEntry[i].Value <<= OUString((const sal_Unicode*)pEntry->pwszDNSName);
                 break;
             case CERT_ALT_NAME_DIRECTORY_NAME :
                 {
@@ -105,7 +104,7 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno:
                 }
             case CERT_ALT_NAME_URL :
                 arrCertAltNameEntry[i].Type = ExtAltNameType_URL;
-                arrCertAltNameEntry[i].Value <<= ::rtl::OUString((const sal_Unicode*)pEntry->pwszURL);
+                arrCertAltNameEntry[i].Value <<= OUString((const sal_Unicode*)pEntry->pwszURL);
                 break;
             case CERT_ALT_NAME_IP_ADDRESS :
                 {
@@ -120,7 +119,7 @@ sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno:
                 }
             case CERT_ALT_NAME_REGISTERED_ID :
                 arrCertAltNameEntry[i].Type = ExtAltNameType_REGISTERED_ID;
-                arrCertAltNameEntry[i].Value <<= ::rtl::OUString::createFromAscii(pEntry->pszRegisteredID);
+                arrCertAltNameEntry[i].Value <<= OUString::createFromAscii(pEntry->pszRegisteredID);
                 break;
           }
         }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index c1b2194efc4d..3bdcd562dd98 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -51,7 +51,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 ;
@@ -537,7 +536,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: getCertificate( con
     encoding = osl_getTextEncodingFromLocale( pLocale ) ;
 
     //Create cert info from issue and serial
-    rtl::OString oissuer = rtl::OUStringToOString( issuerName , encoding ) ;
+    OString oissuer = OUStringToOString( issuerName , encoding ) ;
     pszName = ( char* )oissuer.getStr() ;
 
     if( ! ( CertStrToName(
@@ -865,7 +864,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl :: createCertificateFr
     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() ) ;
 
@@ -1159,9 +1158,9 @@ X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert )
     return xcert ;
 }
 
-::rtl::OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
+OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException )
 {
-    return rtl::OUString("Microsoft Crypto API");
+    return OUString("Microsoft Crypto API");
 }
 
 /* Native methods */
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index e721b36c176b..23352433adac 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -88,13 +88,13 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
             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 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 )
+            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(
@@ -106,7 +106,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
             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 )
+            const OUString& asciiCertificate )
             throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ;
 
         virtual ::sal_Int32 SAL_CALL verifyCertificate(
@@ -119,7 +119,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
             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(  )
+        virtual OUString SAL_CALL getSecurityEnvironmentInformation(  )
             throw (::com::sun::star::uno::RuntimeException);
 
 
@@ -129,18 +129,18 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<
         ) 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(
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 9f69255fe98f..36ea2903ae1b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -47,7 +47,7 @@ SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl()
 /* XSEInitializer */
 cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     SEInitializer_MSCryptImpl::createSecurityContext(
-    const rtl::OUString& sCertDB )
+    const OUString& sCertDB )
     throw (cssu::RuntimeException)
 {
     const char* n_pCertStore ;
@@ -56,7 +56,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
     //Initialize the crypto engine
     if( sCertDB.getLength() > 0 )
     {
-        rtl::OString sCertDir(sCertDB.getStr(), sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
+        OString sCertDir(sCertDB.getStr(), sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
         n_pCertStore = sCertDir.getStr();
         n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ;
         if( n_hStoreHandle == NULL )
@@ -74,7 +74,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
 
     try {
         /* Build Security Environment */
-        const rtl::OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
+        const OUString sSecyrutyEnvironment ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_ENVIRONMENT ) );
         cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv( mxMSF->createInstance ( sSecyrutyEnvironment ), cssu::UNO_QUERY );
         if( !xSecEnv.is() )
         {
@@ -123,7 +123,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
         }
 
         /* Build XML Security Context */
-        const rtl::OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
+        const OUString sSecyrutyContext ( RTL_CONSTASCII_USTRINGPARAM( SECURITY_CONTEXT ) );
         cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx( mxMSF->createInstance ( sSecyrutyContext ), cssu::UNO_QUERY );
         if( !xSecCtx.is() )
         {
@@ -181,24 +181,24 @@ void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Refere
     xmlSecMSCryptoAppShutdown() ;
 }
 
-rtl::OUString SEInitializer_MSCryptImpl_getImplementationName ()
+OUString SEInitializer_MSCryptImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -210,17 +210,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createIns
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName(  )
+OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_getImplementationName();
 }
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return SEInitializer_MSCryptImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index 3b1ae78346e3..e622f933f3be 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -60,7 +60,7 @@ public:
     /* XSEInitializer */
     virtual com::sun::star::uno::Reference<
         com::sun::star::xml::crypto::XXMLSecurityContext >
-        SAL_CALL createSecurityContext( const rtl::OUString& certDB )
+        SAL_CALL createSecurityContext( const OUString& certDB )
         throw (com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference<
@@ -68,23 +68,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_MSCryptImpl_getImplementationName()
+OUString SEInitializer_MSCryptImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index bf9b518cfc2b..2ec2145a7ca6 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -34,7 +34,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 ;
@@ -196,7 +195,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
     }
 }
 
-::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
+OUString SAL_CALL X509Certificate_MSCryptImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) {
     if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL ) {
         char* issuer ;
         DWORD cbIssuer ;
@@ -245,7 +244,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
     }
 }
 
-::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
     {
@@ -378,7 +377,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
             pExtn = &(m_pCertContext->pCertInfo->rgExtension[i]) ;
 
 
-            ::rtl::OUString objId = ::rtl::OUString::createFromAscii( pExtn->pszObjId );
+            OUString objId = OUString::createFromAscii( pExtn->pszObjId );
 
             if ( objId == "2.5.29.17" )
                 xExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ;
@@ -497,7 +496,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
         return NULL ;
 }
 
-::rtl::OUString findOIDDescription(char *oid)
+OUString findOIDDescription(char *oid)
 {
     OUString ouOID = OUString::createFromAscii( oid );
     for (int i=0; i<nOID; i++)
@@ -538,7 +537,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
     return Sequence< sal_Int8 >();
 }
 
-::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
+OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
@@ -573,7 +572,7 @@ X509Certificate_MSCryptImpl* X509Certificate_MSCryptImpl :: getImplementation( c
     }
 }
 
-::rtl::OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm()
+OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm()
     throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( m_pCertContext != NULL && m_pCertContext->pCertInfo != NULL )
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index 1d327251add2..73801d8e1bc2 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -52,8 +52,8 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2<
         virtual sal_Int16 SAL_CALL getVersion() throw ( ::com::sun::star::uno::RuntimeException) ;
 
         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) ;
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) ;
@@ -61,11 +61,11 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2<
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( ::com::sun::star::uno::RuntimeException) ;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException) ;
         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()
             throw ( ::com::sun::star::uno::RuntimeException) ;
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 2addf5505c63..5020c2c71597 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -39,7 +39,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/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
index 470557b9b545..80fe3ff1971a 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx
@@ -67,18 +67,18 @@ class XMLEncryption_MSCryptImpl : 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/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 1aa241ad9a1a..fd67c7e3997c 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.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/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
index 9ee8e029647f..16416b8cf93b 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx
@@ -81,18 +81,18 @@ class XMLSecurityContext_MSCryptImpl : 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/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
index 73a17612ea7d..2f3907ab3411 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx
@@ -33,7 +33,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/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
index 40bb7c1ce447..3d231ad41254 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx
@@ -67,18 +67,18 @@ class XMLSignature_MSCryptImpl : 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/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 ) ;
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index 5bac10de7c8a..8a6447dbe92f 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -35,9 +35,9 @@ namespace cssxcsax = com::sun::star::xml::csax;
  * The return value is NULL terminated. The application has the responsibilty to
  * deallocte the return value.
  */
-xmlChar* ous_to_xmlstr( const rtl::OUString& oustr )
+xmlChar* ous_to_xmlstr( const OUString& oustr )
 {
-    rtl::OString ostr = rtl::OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
+    OString ostr = OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
     return xmlStrndup( ( xmlChar* )ostr.getStr(), ( int )ostr.getLength() ) ;
 }
 
@@ -45,9 +45,9 @@ xmlChar* ous_to_xmlstr( const rtl::OUString& oustr )
  * The return value is NULL terminated. The application has the responsibilty to
  * deallocte the return value.
  */
-xmlChar* ous_to_nxmlstr( const rtl::OUString& oustr, int& length )
+xmlChar* ous_to_nxmlstr( const OUString& oustr, int& length )
 {
-    rtl::OString ostr = rtl::OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
+    OString ostr = OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
     length = ostr.getLength();
 
     return xmlStrndup( ( xmlChar* )ostr.getStr(), length ) ;
@@ -264,7 +264,7 @@ void SAXHelper::endDocument( void )
  * XDocumentHandler -- start an xml element
  */
 void SAXHelper::startElement(
-    const rtl::OUString& aName,
+    const OUString& aName,
     const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
     throw( cssxs::SAXException , cssu::RuntimeException )
 {
@@ -301,7 +301,7 @@ void SAXHelper::startElement(
 /**
  * XDocumentHandler -- end an xml element
  */
-void SAXHelper::endElement( const rtl::OUString& aName )
+void SAXHelper::endElement( const OUString& aName )
     throw( cssxs::SAXException , cssu::RuntimeException )
 {
     xmlChar* fullname = NULL ;
@@ -319,7 +319,7 @@ void SAXHelper::endElement( const rtl::OUString& aName )
 /**
  * XDocumentHandler -- an xml element or cdata characters
  */
-void SAXHelper::characters( const rtl::OUString& aChars )
+void SAXHelper::characters( const OUString& aChars )
     throw( cssxs::SAXException , cssu::RuntimeException )
 {
     const xmlChar* chars = NULL ;
@@ -337,7 +337,7 @@ void SAXHelper::characters( const rtl::OUString& aChars )
 /**
  * XDocumentHandler -- ignorable xml white space
  */
-void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces )
+void SAXHelper::ignorableWhitespace( const OUString& aWhitespaces )
     throw( cssxs::SAXException , cssu::RuntimeException )
 {
     const xmlChar* chars = NULL ;
@@ -356,8 +356,8 @@ void SAXHelper::ignorableWhitespace( const rtl::OUString& aWhitespaces )
  * XDocumentHandler -- preaorocessing instruction
  */
 void SAXHelper::processingInstruction(
-    const rtl::OUString& aTarget,
-    const rtl::OUString& aData )
+    const OUString& aTarget,
+    const OUString& aData )
     throw( cssxs::SAXException , cssu::RuntimeException )
 {
     xmlChar* target = NULL ;
diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx
index e6c0d4e8a329..d11b3e505205 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.hxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.hxx
@@ -52,23 +52,23 @@ class SAXHelper
             throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
 
         void startElement(
-            const ::rtl::OUString& aName ,
+            const OUString& aName ,
             const com::sun::star::uno::Sequence<
                 com::sun::star::xml::csax::XMLAttribute >& aAttributes )
             throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
 
-        void endElement( const ::rtl::OUString& aName )
+        void endElement( const OUString& aName )
             throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
 
-        void characters( const ::rtl::OUString& aChars )
+        void characters( const OUString& aChars )
             throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
 
-        void ignorableWhitespace( const ::rtl::OUString& aWhitespaces )
+        void ignorableWhitespace( const OUString& aWhitespaces )
             throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
 
         void processingInstruction(
-            const ::rtl::OUString& aTarget ,
-            const ::rtl::OUString& aData )
+            const OUString& aTarget ,
+            const OUString& aData )
             throw( ::com::sun::star::xml::sax::SAXException , ::com::sun::star::uno::RuntimeException ) ;
 
         void setDocumentLocator( const ::com::sun::star::uno::Reference<
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
index 987d00c6986c..86159fc53d3c 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx
@@ -37,9 +37,9 @@ namespace xml_security { namespace serial_number_adapter {
 css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     css::uno::Reference< css::uno::XComponentContext > const &);
 
-rtl::OUString implementationName() throw (css::uno::RuntimeException);
+OUString implementationName() throw (css::uno::RuntimeException);
 
-css::uno::Sequence< rtl::OUString > serviceNames()
+css::uno::Sequence< OUString > serviceNames()
     throw (css::uno::RuntimeException);
 
 } }
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index fbbb16ae4595..6e5159734367 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -64,7 +64,7 @@ XMLDocumentWrapper_XmlSecImpl::XMLDocumentWrapper_XmlSecImpl( )
     /*
      * creates the virtual root element
      */
-    saxHelper.startElement(rtl::OUString(RTL_UTF8_USTRINGPARAM( "root" )), cssu::Sequence<cssxcsax::XMLAttribute>());
+    saxHelper.startElement(OUString(RTL_UTF8_USTRINGPARAM( "root" )), cssu::Sequence<cssxcsax::XMLAttribute>());
 
     m_pRootElement = saxHelper.getCurrentNode();
     m_pCurrentElement = m_pRootElement;
@@ -221,16 +221,16 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
         if (pNsDef->prefix == NULL)
         {
             pAttributeList->AddAttribute(
-                rtl::OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS )),
-                rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref )));
+                OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS )),
+                OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref )));
         }
         else
         {
             pAttributeList->AddAttribute(
-                rtl::OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS ))
-                +rtl::OUString(RTL_UTF8_USTRINGPARAM( ":" ))
-                +rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsPrefix )),
-                rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref )));
+                OUString(RTL_UTF8_USTRINGPARAM( STRXMLNS ))
+                +OUString(RTL_UTF8_USTRINGPARAM( ":" ))
+                +OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsPrefix )),
+                OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pNsHref )));
         }
 
         pNsDef = pNsDef->next;
@@ -243,35 +243,35 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
         const xmlChar* pAttrName = pAttr->name;
         xmlNsPtr pAttrNs = pAttr->ns;
 
-        rtl::OUString ouAttrName;
+        OUString ouAttrName;
         if (pAttrNs == NULL)
         {
-            ouAttrName = rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName ));
+            ouAttrName = OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName ));
         }
         else
         {
-            ouAttrName = rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrNs->prefix))
-                +rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)":" ))
-                +rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName ));
+            ouAttrName = OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrNs->prefix))
+                +OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)":" ))
+                +OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)pAttrName ));
         }
 
         pAttributeList->AddAttribute(
             ouAttrName,
-            rtl::OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)(pAttr->children->content))));
+            OUString(RTL_UTF8_USTRINGPARAM( (sal_Char*)(pAttr->children->content))));
         pAttr = pAttr->next;
     }
 
-    rtl::OString sNodeName = getNodeQName(pNode);
+    OString sNodeName = getNodeQName(pNode);
 
     if (xHandler.is())
     {
         xHandler->startElement(
-            rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )),
+            OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )),
             xAttrList);
     }
 
     xHandler2->startElement(
-        rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )),
+        OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )),
         xAttrList);
 }
 
@@ -309,14 +309,14 @@ void XMLDocumentWrapper_XmlSecImpl::sendEndElement(
  *  Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    rtl::OString sNodeName = getNodeQName(pNode);
+    OString sNodeName = getNodeQName(pNode);
 
     if (xHandler.is())
     {
-        xHandler->endElement(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )));
+        xHandler->endElement(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )));
     }
 
-    xHandler2->endElement(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )));
+    xHandler2->endElement(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(sNodeName.getStr())) )));
 }
 
 void XMLDocumentWrapper_XmlSecImpl::sendNode(
@@ -363,27 +363,27 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode(
     {
         if (xHandler.is())
         {
-            xHandler->characters(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
+            xHandler->characters(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
         }
 
-        xHandler2->characters(rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
+        xHandler2->characters(OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
     }
     else if (type == XML_PI_NODE)
     {
         if (xHandler.is())
         {
             xHandler->processingInstruction(
-                rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )),
-                rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
+                OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )),
+                OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
         }
 
         xHandler2->processingInstruction(
-            rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )),
-            rtl::OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
+            OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->name)) )),
+            OUString(RTL_UTF8_USTRINGPARAM ( ((sal_Char*)(pNode->content)) )));
     }
 }
 
-rtl::OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) const
+OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) const
 /****** XMLDocumentWrapper_XmlSecImpl/getNodeQName ****************************
  *
  *   NAME
@@ -406,15 +406,15 @@ rtl::OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode)
  *  Email: michael.mi@sun.com
  ******************************************************************************/
 {
-    rtl::OString sNodeName((const sal_Char*)pNode->name);
+    OString sNodeName((const sal_Char*)pNode->name);
     if (pNode->ns != NULL)
     {
         xmlNsPtr pNs = pNode->ns;
 
         if (pNs->prefix != NULL)
         {
-            rtl::OString sPrefix((const sal_Char*)pNs->prefix);
-            sNodeName = sPrefix+rtl::OString(":")+sNodeName;
+            OString sPrefix((const sal_Char*)pNs->prefix);
+            sNodeName = sPrefix+OString(":")+sNodeName;
         }
     }
 
@@ -744,7 +744,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement(  )
      * the current node as well.
      */
     saxHelper.endElement(
-        rtl::OUString(
+        OUString(
             RTL_UTF8_USTRINGPARAM (
                 (sal_Char*)(pOldCurrentElement->name)
             )));
@@ -776,11 +776,11 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty(  )
     return rc;
 }
 
-rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node )
+OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node )
     throw (cssu::RuntimeException)
 {
     xmlNodePtr pNode = checkElement(node);
-    return rtl::OUString(RTL_UTF8_USTRINGPARAM ( (sal_Char*)pNode->name ));
+    return OUString(RTL_UTF8_USTRINGPARAM ( (sal_Char*)pNode->name ));
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData(
@@ -957,7 +957,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endDocument(  )
 {
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const rtl::OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     sal_Int32 nLength = xAttribs->getLength();
@@ -972,26 +972,26 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const rtl::OUString&
     _startElement(aName, aAttributes);
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const rtl::OUString& aName )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.endElement(aName);
     m_pCurrentElement = saxHelper.getCurrentNode();
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const rtl::OUString& aChars )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.characters(aChars);
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const rtl::OUString& aWhitespaces )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.ignorableWhitespace(aWhitespaces);
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const OUString& aTarget, const OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.processingInstruction(aTarget, aData);
@@ -1014,7 +1014,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endDocument(  )
 {
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const rtl::OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     saxHelper.startElement(aName, aAttributes);
@@ -1023,53 +1023,53 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const rtl::OUString&
     buildIDAttr( m_pCurrentElement );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const rtl::OUString& aName )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const OUString& aName )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     endElement( aName );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const rtl::OUString& aChars )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     characters( aChars );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const rtl::OUString& aWhitespaces )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     ignorableWhitespace( aWhitespaces );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const OUString& aTarget, const OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
     processingInstruction( aTarget, aData );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const rtl::OUString& /*publicId*/, const rtl::OUString& /*systemId*/ )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ )
     throw (cssxs::SAXException, cssu::RuntimeException)
 {
 }
 
-rtl::OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName ()
+OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_ASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_ASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_ASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_ASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -1082,17 +1082,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_creat
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName(  )
+OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return XMLDocumentWrapper_XmlSecImpl_getImplementationName();
 }
-sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return XMLDocumentWrapper_XmlSecImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index 1394fa6edd3e..3536a3b5054e 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -112,7 +112,7 @@ private:
         const xmlNodePtr pNode) const
         throw (com::sun::star::xml::sax::SAXException);
 
-    rtl::OString getNodeQName(const xmlNodePtr pNode) const;
+    OString getNodeQName(const xmlNodePtr pNode) const;
 
     sal_Int32 recursiveDelete( const xmlNodePtr pNode);
 
@@ -150,7 +150,7 @@ public:
     virtual sal_Bool SAL_CALL isCurrentElementEmpty(  )
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference<
+    virtual OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference<
         com::sun::star::xml::wrapper::XXMLElementWrapper >& node )
         throw (com::sun::star::uno::RuntimeException);
 
@@ -192,20 +192,20 @@ public:
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL startElement(
-        const rtl::OUString& aName,
+        const OUString& aName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL endElement( const rtl::OUString& aName )
+    virtual void SAL_CALL endElement( const OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL characters( const rtl::OUString& aChars )
+    virtual void SAL_CALL characters( const OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL ignorableWhitespace( const rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator )
@@ -219,48 +219,48 @@ public:
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL _startElement(
-        const rtl::OUString& aName,
+        const OUString& aName,
         const com::sun::star::uno::Sequence<
             com::sun::star::xml::csax::XMLAttribute >& aAttributes )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL _endElement( const rtl::OUString& aName )
+    virtual void SAL_CALL _endElement( const OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL _characters( const rtl::OUString& aChars )
+    virtual void SAL_CALL _characters( const OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL _ignorableWhitespace( const rtl::OUString& aWhitespaces )
+    virtual void SAL_CALL _ignorableWhitespace( const OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL _processingInstruction( const rtl::OUString& aTarget, const rtl::OUString& aData )
+    virtual void SAL_CALL _processingInstruction( const OUString& aTarget, const OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL _setDocumentLocator(
         sal_Int32 columnNumber,
         sal_Int32 lineNumber,
-        const rtl::OUString& publicId,
-        const rtl::OUString& systemId )
+        const OUString& publicId,
+        const OUString& systemId )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
     /* com::sun::star::lang::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 XMLDocumentWrapper_XmlSecImpl_getImplementationName()
+OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+com::sun::star::uno::Sequence< OUString > SAL_CALL
     XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index d0363b38e4a9..de4570134736 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -70,24 +70,24 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque
 }
 
 
-rtl::OUString XMLElementWrapper_XmlSecImpl_getImplementationName ()
+OUString XMLElementWrapper_XmlSecImpl_getImplementationName ()
     throw (cssu::RuntimeException)
 {
-    return rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
 }
 
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName )
     throw (cssu::RuntimeException)
 {
     return ServiceName == SERVICE_NAME;
 }
 
-cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
-    cssu::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+    cssu::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
     return aRet;
 }
 #undef SERVICE_NAME
@@ -101,17 +101,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL
 }
 
 /* XServiceInfo */
-rtl::OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName(  )
+OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName(  )
     throw (cssu::RuntimeException)
 {
     return XMLElementWrapper_XmlSecImpl_getImplementationName();
 }
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const rtl::OUString& rServiceName )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName )
     throw (cssu::RuntimeException)
 {
     return XMLElementWrapper_XmlSecImpl_supportsService( rServiceName );
 }
-cssu::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames(  )
+cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames(  )
     throw (cssu::RuntimeException)
 {
     return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames();
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 73b0b21ebbfc..8bc32f95b595 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -69,11 +69,11 @@ public:
         throw(com::sun::star::uno::RuntimeException);
 
     /* com::sun::star::lang::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);
 
 public:
@@ -81,13 +81,13 @@ public:
     void setNativeElement(const xmlNodePtr pNode);
 };
 
-rtl::OUString XMLElementWrapper_XmlSecImpl_getImplementationName()
+OUString XMLElementWrapper_XmlSecImpl_getImplementationName()
     throw ( com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl_supportsService( const OUString& ServiceName )
     throw ( com::sun::star::uno::RuntimeException );
 
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
+com::sun::star::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(  )
     throw ( com::sun::star::uno::RuntimeException );
 
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 43a8d6ace97f..91f2d9084dd3 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -53,8 +53,8 @@ int xmlStreamMatch( const char* uri )
         //first. If this failed it would try this
         //again with the original escaped string. However, it does not get this far, because there
         //is another callback registered by libxml which claims to be able to handle this uri.
-        ::rtl::OUString sUri =
-            ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ),
+        OUString sUri =
+            ::rtl::Uri::encode( OUString::createFromAscii( uri ),
             rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
         xInputStream = m_xUriBinding->getUriBinding( sUri ) ;
         if (!xInputStream.is())
@@ -62,7 +62,7 @@ int xmlStreamMatch( const char* uri )
             //Try the passed in uri directly.
             //For old documents prior OOo 3.0. We did not use URIs then.
             xInputStream = m_xUriBinding->getUriBinding(
-                ::rtl::OUString::createFromAscii(uri));
+                OUString::createFromAscii(uri));
         }
     }
     if (xInputStream.is())
@@ -82,8 +82,8 @@ void* xmlStreamOpen( const char* uri )
             return NULL ;
 
         //see xmlStreamMatch
-        ::rtl::OUString sUri =
-            ::rtl::Uri::encode( ::rtl::OUString::createFromAscii( uri ),
+        OUString sUri =
+            ::rtl::Uri::encode( OUString::createFromAscii( uri ),
             rtl_UriCharClassUric, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8);
         xInputStream = m_xUriBinding->getUriBinding( sUri ) ;
         if (!xInputStream.is())
@@ -91,7 +91,7 @@ void* xmlStreamOpen( const char* uri )
             //For old documents.
             //try the passed in uri directly.
             xInputStream = m_xUriBinding->getUriBinding(
-                ::rtl::OUString::createFromAscii(uri));
+                OUString::createFromAscii(uri));
         }
 
         if( xInputStream.is() ) {
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 0497179069ed..754239c722f5 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -246,11 +246,11 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     maHintText.Show();
 
     // Help the user with some default values
-    ::rtl::OUString aTempDirURL;
+    OUString aTempDirURL;
     ::osl::File::getTempDirURL( aTempDirURL );
     INetURLObject aURLObj( aTempDirURL );
     aURLObj.insertName( "nss", true );
-    ::rtl::OUString aNSSFolder = aURLObj.getFSysPath( INetURLObject::FSYS_DETECT );
+    OUString aNSSFolder = aURLObj.getFSysPath( INetURLObject::FSYS_DETECT );
     maEditXMLFileName.SetText( aNSSFolder + "demo-sample.xml" );
     maEditBINFileName.SetText( aNSSFolder + "demo-sample.gif" );
     maEditDOCFileName.SetText( aNSSFolder + "demo-sample.sxw" );
@@ -282,7 +282,7 @@ IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl)
 
 IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl)
 {
-    rtl::OUString aDocFileName = maEditDOCFileName.GetText();
+    OUString aDocFileName = maEditDOCFileName.GetText();
     uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(
             aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );
 
@@ -296,7 +296,7 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl)
 
 IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl)
 {
-    rtl::OUString aDocFileName = maEditDOCFileName.GetText();
+    OUString aDocFileName = maEditDOCFileName.GetText();
     uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(
             aDocFileName, embed::ElementModes::READWRITE, comphelper::getProcessServiceFactory() );