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

5 files changed, 54 insertions, 54 deletions

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() );
     }