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

19 files changed, 150 insertions, 152 deletions

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