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

13 files changed, 212 insertions, 213 deletions

diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 0888326e340a..fde82194d410 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -53,21 +53,21 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & context):
         m_context(context) {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
         throw (css::uno::RuntimeException);
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL
-    translateToInternal(rtl::OUString const & externalUriReference)
+    virtual OUString SAL_CALL
+    translateToInternal(OUString const & externalUriReference)
         throw (css::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL
-    translateToExternal(rtl::OUString const & internalUriReference)
+    virtual OUString SAL_CALL
+    translateToExternal(OUString const & internalUriReference)
         throw (css::uno::RuntimeException);
 
 private:
@@ -79,29 +79,29 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_context;
 };
 
-rtl::OUString Translator::getImplementationName()
+OUString Translator::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return
         stoc_services::ExternalUriReferenceTranslator::getImplementationName();
 }
 
-sal_Bool Translator::supportsService(rtl::OUString const & serviceName)
+sal_Bool Translator::supportsService(OUString const & serviceName)
     throw (css::uno::RuntimeException)
 {
     return stoc::uriproc::supportsService(
         getSupportedServiceNames(), serviceName);
 }
 
-css::uno::Sequence< rtl::OUString > Translator::getSupportedServiceNames()
+css::uno::Sequence< OUString > Translator::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return stoc_services::ExternalUriReferenceTranslator::
         getSupportedServiceNames();
 }
 
-rtl::OUString Translator::translateToInternal(
-    rtl::OUString const & externalUriReference)
+OUString Translator::translateToInternal(
+    OUString const & externalUriReference)
     throw (css::uno::RuntimeException)
 {
     if (!externalUriReference.matchIgnoreAsciiCaseAsciiL(
@@ -110,7 +110,7 @@ rtl::OUString Translator::translateToInternal(
         return externalUriReference;
     }
     sal_Int32 i = RTL_CONSTASCII_LENGTH("file:");
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     buf.append(externalUriReference.getStr(), i);
     // Some environments (e.g., Java) produce illegal file URLs without an
     // authority part; treat them as having an empty authority part:
@@ -128,7 +128,7 @@ rtl::OUString Translator::translateToInternal(
             ++j;
         }
         if (j != i) {
-            rtl::OUString seg(
+            OUString seg(
                 rtl::Uri::encode(
                     rtl::Uri::decode(
                         externalUriReference.copy(i, j - i),
@@ -136,7 +136,7 @@ rtl::OUString Translator::translateToInternal(
                     rtl_UriCharClassPchar, rtl_UriEncodeStrict,
                     RTL_TEXTENCODING_UTF8));
             if (seg.isEmpty()) {
-                return rtl::OUString();
+                return OUString();
             }
             buf.append(seg);
         }
@@ -150,8 +150,8 @@ rtl::OUString Translator::translateToInternal(
     return buf.makeStringAndClear();
 }
 
-rtl::OUString Translator::translateToExternal(
-    rtl::OUString const & internalUriReference)
+OUString Translator::translateToExternal(
+    OUString const & internalUriReference)
     throw (css::uno::RuntimeException)
 {
     if (!internalUriReference.matchIgnoreAsciiCaseAsciiL(
@@ -160,7 +160,7 @@ rtl::OUString Translator::translateToExternal(
         return internalUriReference;
     }
     sal_Int32 i = RTL_CONSTASCII_LENGTH("file://");
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     buf.append(internalUriReference.getStr(), i);
     rtl_TextEncoding encoding = osl_getThreadTextEncoding();
     for (bool path = true;;) {
@@ -175,7 +175,7 @@ rtl::OUString Translator::translateToExternal(
             // Use rtl_UriDecodeToIuri -> rtl_UriEncodeStrictKeepEscapes instead
             // of rtl_UriDecodeStrict -> rtl_UriEncodeStrict, so that spurious
             // non--UTF-8 octets like "%FE" are copied verbatim:
-            rtl::OUString seg(
+            OUString seg(
                 rtl::Uri::encode(
                     rtl::Uri::decode(
                         internalUriReference.copy(i, j - i),
@@ -183,7 +183,7 @@ rtl::OUString Translator::translateToExternal(
                     rtl_UriCharClassPchar, rtl_UriEncodeStrictKeepEscapes,
                     encoding));
             if (seg.isEmpty()) {
-                return rtl::OUString();
+                return OUString();
             }
             buf.append(seg);
         }
@@ -209,17 +209,17 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Translator(context));
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString("std::bad_alloc"), 0);
+            OUString("std::bad_alloc"), 0);
     }
 }
 
-rtl::OUString getImplementationName() {
-    return rtl::OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
+OUString getImplementationName() {
+    return OUString("com.sun.star.comp.uri.ExternalUriReferenceTranslator");
 }
 
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
-    css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString("com.sun.star.uri.ExternalUriReferenceTranslator");
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+    css::uno::Sequence< OUString > s(1);
+    s[0] = OUString("com.sun.star.uri.ExternalUriReferenceTranslator");
     return s;
 }
 
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
index f823286cc439..3da16dbcd0bb 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.hxx
@@ -40,9 +40,9 @@ namespace ExternalUriReferenceTranslator {
             const & context)
         SAL_THROW((com::sun::star::uno::Exception));
 
-    rtl::OUString SAL_CALL getImplementationName();
+    OUString SAL_CALL getImplementationName();
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames();
 }
 
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index 2dafb685a8d9..312203d78587 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -30,9 +30,9 @@
 using stoc::uriproc::UriReference;
 
 UriReference::UriReference(
-    rtl::OUString const & scheme, bool bIsHierarchical, bool bHasAuthority,
-    rtl::OUString const & authority, rtl::OUString const & path,
-    bool bHasQuery, rtl::OUString const & query):
+    OUString const & scheme, bool bIsHierarchical, bool bHasAuthority,
+    OUString const & authority, OUString const & path,
+    bool bHasQuery, OUString const & query):
     m_scheme(scheme),
     m_authority(authority),
     m_path(path),
@@ -51,10 +51,10 @@ UriReference::UriReference(
 
 UriReference::~UriReference() {}
 
-rtl::OUString UriReference::getUriReference() throw (css::uno::RuntimeException)
+OUString UriReference::getUriReference() throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     if (!m_scheme.isEmpty()) {
         buf.append(m_scheme);
         buf.append(static_cast< sal_Unicode >(':'));
@@ -71,15 +71,15 @@ sal_Bool UriReference::isAbsolute() throw (css::uno::RuntimeException) {
     return !m_scheme.isEmpty();
 }
 
-rtl::OUString UriReference::getScheme() throw (css::uno::RuntimeException) {
+OUString UriReference::getScheme() throw (css::uno::RuntimeException) {
     return m_scheme;
 }
 
-rtl::OUString UriReference::getSchemeSpecificPart()
+OUString UriReference::getSchemeSpecificPart()
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     appendSchemeSpecificPart(buf);
     return buf.makeStringAndClear();
 }
@@ -94,12 +94,12 @@ sal_Bool UriReference::hasAuthority() throw (css::uno::RuntimeException) {
     return m_hasAuthority;
 }
 
-rtl::OUString UriReference::getAuthority() throw (css::uno::RuntimeException) {
+OUString UriReference::getAuthority() throw (css::uno::RuntimeException) {
     osl::MutexGuard g(m_mutex);
     return m_authority;
 }
 
-rtl::OUString UriReference::getPath() throw (css::uno::RuntimeException) {
+OUString UriReference::getPath() throw (css::uno::RuntimeException) {
     osl::MutexGuard g(m_mutex);
     return m_path;
 }
@@ -128,7 +128,7 @@ sal_Int32 UriReference::getPathSegmentCount() throw (css::uno::RuntimeException)
     }
 }
 
-rtl::OUString UriReference::getPathSegment(sal_Int32 index)
+OUString UriReference::getPathSegment(sal_Int32 index)
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
@@ -144,7 +144,7 @@ rtl::OUString UriReference::getPathSegment(sal_Int32 index)
             }
         }
     }
-    return rtl::OUString();
+    return OUString();
 }
 
 sal_Bool UriReference::hasQuery() throw (css::uno::RuntimeException) {
@@ -152,7 +152,7 @@ sal_Bool UriReference::hasQuery() throw (css::uno::RuntimeException) {
     return m_hasQuery;
 }
 
-rtl::OUString UriReference::getQuery() throw (css::uno::RuntimeException) {
+OUString UriReference::getQuery() throw (css::uno::RuntimeException) {
     osl::MutexGuard g(m_mutex);
     return m_query;
 }
@@ -162,12 +162,12 @@ sal_Bool UriReference::hasFragment() throw (css::uno::RuntimeException) {
     return m_hasFragment;
 }
 
-rtl::OUString UriReference::getFragment() throw (css::uno::RuntimeException) {
+OUString UriReference::getFragment() throw (css::uno::RuntimeException) {
     osl::MutexGuard g(m_mutex);
     return m_fragment;
 }
 
-void UriReference::setFragment(rtl::OUString const & fragment)
+void UriReference::setFragment(OUString const & fragment)
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_mutex);
@@ -178,10 +178,10 @@ void UriReference::setFragment(rtl::OUString const & fragment)
 void UriReference::clearFragment() throw (css::uno::RuntimeException) {
     osl::MutexGuard g(m_mutex);
     m_hasFragment = false;
-    m_fragment = rtl::OUString();
+    m_fragment = OUString();
 }
 
-void UriReference::appendSchemeSpecificPart(rtl::OUStringBuffer & buffer) const
+void UriReference::appendSchemeSpecificPart(OUStringBuffer & buffer) const
 {
     if (m_hasAuthority) {
         buffer.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
diff --git a/stoc/source/uriproc/UriReference.hxx b/stoc/source/uriproc/UriReference.hxx
index e6557cc4cb26..f6037a2325ea 100644
--- a/stoc/source/uriproc/UriReference.hxx
+++ b/stoc/source/uriproc/UriReference.hxx
@@ -24,65 +24,64 @@
 #include "osl/mutex.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
-
-namespace rtl { class OUStringBuffer; }
+#include "rtl/ustrbuf.hxx"
 
 namespace stoc { namespace uriproc {
 
 class UriReference {
 public:
     UriReference(
-        rtl::OUString const & scheme, bool isHierarchical, bool hasAuthority,
-        rtl::OUString const & authority, rtl::OUString const & path,
-        bool hasQuery, rtl::OUString const & query);
+        OUString const & scheme, bool isHierarchical, bool hasAuthority,
+        OUString const & authority, OUString const & path,
+        bool hasQuery, OUString const & query);
 
     ~UriReference();
 
-    rtl::OUString getUriReference()
+    OUString getUriReference()
         throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool isAbsolute() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getScheme() throw (com::sun::star::uno::RuntimeException);
+    OUString getScheme() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getSchemeSpecificPart()
+    OUString getSchemeSpecificPart()
         throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool isHierarchical() throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasAuthority() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getAuthority() throw (com::sun::star::uno::RuntimeException);
+    OUString getAuthority() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getPath() throw (com::sun::star::uno::RuntimeException);
+    OUString getPath() throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasRelativePath() throw (com::sun::star::uno::RuntimeException);
 
     sal_Int32 getPathSegmentCount()
         throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getPathSegment(sal_Int32 index)
+    OUString getPathSegment(sal_Int32 index)
         throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasQuery() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getQuery() throw (com::sun::star::uno::RuntimeException);
+    OUString getQuery() throw (com::sun::star::uno::RuntimeException);
 
     sal_Bool hasFragment() throw (com::sun::star::uno::RuntimeException);
 
-    rtl::OUString getFragment() throw (com::sun::star::uno::RuntimeException);
+    OUString getFragment() throw (com::sun::star::uno::RuntimeException);
 
-    void setFragment(rtl::OUString const & fragment)
+    void setFragment(OUString const & fragment)
         throw (com::sun::star::uno::RuntimeException);
 
     void clearFragment() throw (com::sun::star::uno::RuntimeException);
 
     osl::Mutex m_mutex;
-    rtl::OUString m_scheme;
-    rtl::OUString m_authority;
-    rtl::OUString m_path;
-    rtl::OUString m_query;
-    rtl::OUString m_fragment;
+    OUString m_scheme;
+    OUString m_authority;
+    OUString m_path;
+    OUString m_query;
+    OUString m_fragment;
     bool m_isHierarchical;
     bool m_hasAuthority;
     bool m_hasQuery;
@@ -92,7 +91,7 @@ private:
     UriReference(UriReference &); // not implemented
     void operator =(UriReference); // not implemented
 
-    void appendSchemeSpecificPart(rtl::OUStringBuffer & buffer) const;
+    void appendSchemeSpecificPart(OUStringBuffer & buffer) const;
 };
 
 } }
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index a5f6041339ab..26b693e96651 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -84,7 +84,7 @@ bool equalIgnoreCase(sal_Unicode c1, sal_Unicode c2) {
     return toLowerCase(c1) == toLowerCase(c2);
 }
 
-bool equalIgnoreEscapeCase(rtl::OUString const & s1, rtl::OUString const & s2) {
+bool equalIgnoreEscapeCase(OUString const & s1, OUString const & s2) {
     if (s1.getLength() == s2.getLength()) {
         for (sal_Int32 i = 0; i < s1.getLength();) {
             if (s1[i] == '%' && s2[i] == '%' && s1.getLength() - i > 2
@@ -106,7 +106,7 @@ bool equalIgnoreEscapeCase(rtl::OUString const & s1, rtl::OUString const & s2) {
     }
 }
 
-sal_Int32 parseScheme(rtl::OUString const & uriReference) {
+sal_Int32 parseScheme(OUString const & uriReference) {
     if (uriReference.getLength() >= 2 && isAlpha(uriReference[0])) {
         for (sal_Int32 i = 0; i < uriReference.getLength(); ++i) {
             sal_Unicode c = uriReference[i];
@@ -125,15 +125,15 @@ sal_Int32 parseScheme(rtl::OUString const & uriReference) {
 class UriReference: public cppu::WeakImplHelper1< css::uri::XUriReference > {
 public:
     UriReference(
-        rtl::OUString const & scheme, bool bIsHierarchical, bool bHasAuthority,
-        rtl::OUString const & authority, rtl::OUString const & path,
-        bool bHasQuery, rtl::OUString const & query):
+        OUString const & scheme, bool bIsHierarchical, bool bHasAuthority,
+        OUString const & authority, OUString const & path,
+        bool bHasQuery, OUString const & query):
         m_base(
             scheme, bIsHierarchical, bHasAuthority, authority, path, bHasQuery,
             query)
     {}
 
-    virtual rtl::OUString SAL_CALL getUriReference()
+    virtual OUString SAL_CALL getUriReference()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getUriReference(); }
 
@@ -141,11 +141,11 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.isAbsolute(); }
 
-    virtual rtl::OUString SAL_CALL getScheme()
+    virtual OUString SAL_CALL getScheme()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getScheme(); }
 
-    virtual rtl::OUString SAL_CALL getSchemeSpecificPart()
+    virtual OUString SAL_CALL getSchemeSpecificPart()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getSchemeSpecificPart(); }
 
@@ -157,11 +157,11 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.hasAuthority(); }
 
-    virtual rtl::OUString SAL_CALL getAuthority()
+    virtual OUString SAL_CALL getAuthority()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getAuthority(); }
 
-    virtual rtl::OUString SAL_CALL getPath()
+    virtual OUString SAL_CALL getPath()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getPath(); }
 
@@ -173,7 +173,7 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getPathSegmentCount(); }
 
-    virtual rtl::OUString SAL_CALL getPathSegment(sal_Int32 index)
+    virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getPathSegment(index); }
 
@@ -181,7 +181,7 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.hasQuery(); }
 
-    virtual rtl::OUString SAL_CALL getQuery()
+    virtual OUString SAL_CALL getQuery()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getQuery(); }
 
@@ -189,11 +189,11 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.hasFragment(); }
 
-    virtual rtl::OUString SAL_CALL getFragment()
+    virtual OUString SAL_CALL getFragment()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getFragment(); }
 
-    virtual void SAL_CALL setFragment(rtl::OUString const & fragment)
+    virtual void SAL_CALL setFragment(OUString const & fragment)
         throw (com::sun::star::uno::RuntimeException)
     { m_base.setFragment(fragment); }
 
@@ -212,17 +212,17 @@ private:
 
 // throws std::bad_alloc
 css::uno::Reference< css::uri::XUriReference > parseGeneric(
-    rtl::OUString const & scheme, rtl::OUString const & schemeSpecificPart)
+    OUString const & scheme, OUString const & schemeSpecificPart)
 {
     bool isAbsolute = !scheme.isEmpty();
     bool isHierarchical
         = !isAbsolute
         || (!schemeSpecificPart.isEmpty() && schemeSpecificPart[0] == '/');
     bool hasAuthority = false;
-    rtl::OUString authority;
-    rtl::OUString path;
+    OUString authority;
+    OUString path;
     bool hasQuery = false;
-    rtl::OUString query;
+    OUString query;
     if (isHierarchical) {
         sal_Int32 len = schemeSpecificPart.getLength();
         sal_Int32 i = 0;
@@ -270,7 +270,7 @@ void processSegments(
     OSL_ASSERT(count <= SAL_MAX_INT32 - 1 && -count >= SAL_MIN_INT32 + 1);
     for (sal_Int32 i = 0; i < count; ++i) {
         if (processSpecialSegments) {
-            rtl::OUString segment(uriReference->getPathSegment(i));
+            OUString segment(uriReference->getPathSegment(i));
             if ( segment == "." ) {
                 if (!base && i == count - 1) {
                     segments.push_back(0);
@@ -299,17 +299,17 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & context):
         m_context(context) {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
         throw (css::uno::RuntimeException);
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException);
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
-    parse(rtl::OUString const & uriReference)
+    parse(OUString const & uriReference)
         throw (css::uno::RuntimeException);
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
@@ -342,41 +342,41 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_context;
 };
 
-rtl::OUString Factory::getImplementationName()
+OUString Factory::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return stoc_services::UriReferenceFactory::getImplementationName();
 }
 
-sal_Bool Factory::supportsService(rtl::OUString const & serviceName)
+sal_Bool Factory::supportsService(OUString const & serviceName)
     throw (css::uno::RuntimeException)
 {
     return stoc::uriproc::supportsService(
         getSupportedServiceNames(), serviceName);
 }
 
-css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames()
+css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return stoc_services::UriReferenceFactory::getSupportedServiceNames();
 }
 
 css::uno::Reference< css::uri::XUriReference > Factory::parse(
-    rtl::OUString const & uriReference) throw (css::uno::RuntimeException)
+    OUString const & uriReference) throw (css::uno::RuntimeException)
 {
     sal_Int32 fragment = uriReference.indexOf('#');
     if (fragment == -1) {
         fragment = uriReference.getLength();
     }
-    rtl::OUString scheme;
-    rtl::OUString schemeSpecificPart;
-    rtl::OUString serviceName;
+    OUString scheme;
+    OUString schemeSpecificPart;
+    OUString serviceName;
     sal_Int32 n = parseScheme(uriReference);
     OSL_ASSERT(n < fragment);
     if (n >= 0) {
         scheme = uriReference.copy(0, n);
         schemeSpecificPart = uriReference.copy(n + 1, fragment - (n + 1));
-        rtl::OUStringBuffer buf;
+        OUStringBuffer buf;
         buf.appendAscii(
             RTL_CONSTASCII_STRINGPARAM("com.sun.star.uri.UriSchemeParser_"));
         for (sal_Int32 i = 0; i < scheme.getLength(); ++i) {
@@ -411,7 +411,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
                 throw;
             } catch (const css::uno::Exception & e) {
                 throw css::lang::WrappedTargetRuntimeException(
-                    rtl::OUString("creating service ")
+                    OUString("creating service ")
                         + serviceName,
                     static_cast< cppu::OWeakObject * >(this),
                     css::uno::makeAny(e)); //TODO: preserve type of e
@@ -430,7 +430,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
             uriRef = parseGeneric(scheme, schemeSpecificPart);
         } catch (std::bad_alloc &) {
             throw css::uno::RuntimeException(
-                rtl::OUString("std::bad_alloc"),
+                OUString("std::bad_alloc"),
                 static_cast< cppu::OWeakObject * >(this));
         }
     }
@@ -464,7 +464,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
         }
         return abs;
     } else {
-        rtl::OUStringBuffer abs(baseUriReference->getScheme());
+        OUStringBuffer abs(baseUriReference->getScheme());
         abs.append(static_cast< sal_Unicode >(':'));
         if (uriReference->hasAuthority()) {
             abs.appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
@@ -492,7 +492,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
                  ++i)
             {
                 if (*i < -1) {
-                    rtl::OUString segment(
+                    OUString segment(
                         baseUriReference->getPathSegment(-(*i + 2)));
                     if (!segment.isEmpty() || segments.size() > 1) {
                         if (!slash) {
@@ -503,7 +503,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
                         abs.append(static_cast< sal_Unicode >('/'));
                     }
                 } else if (*i > 1) {
-                    rtl::OUString segment(uriReference->getPathSegment(*i - 2));
+                    OUString segment(uriReference->getPathSegment(*i - 2));
                     if (!segment.isEmpty() || segments.size() > 1) {
                         if (!slash) {
                             abs.append(static_cast< sal_Unicode >('/'));
@@ -571,7 +571,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
                    uriReference->getScheme())) {
         return clone(uriReference);
     } else {
-        rtl::OUStringBuffer rel;
+        OUStringBuffer rel;
         bool omitQuery = false;
         if ((baseUriReference->hasAuthority() != uriReference->hasAuthority())
             || !equalIgnoreEscapeCase(
@@ -651,7 +651,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
                         if (segments) {
                             rel.append(static_cast< sal_Unicode >('/'));
                         }
-                        rtl::OUString s(uriReference->getPathSegment(i));
+                        OUString s(uriReference->getPathSegment(i));
                         if (encodeRetainedSpecialSegments
                             && s.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".")))
                         {
@@ -694,17 +694,17 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Factory(context));
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString("std::bad_alloc"), 0);
+            OUString("std::bad_alloc"), 0);
     }
 }
 
-rtl::OUString getImplementationName() {
-    return rtl::OUString("com.sun.star.comp.uri.UriReferenceFactory");
+OUString getImplementationName() {
+    return OUString("com.sun.star.comp.uri.UriReferenceFactory");
 }
 
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
-    css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString("com.sun.star.uri.UriReferenceFactory");
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+    css::uno::Sequence< OUString > s(1);
+    s[0] = OUString("com.sun.star.uri.UriReferenceFactory");
     return s;
 }
 
diff --git a/stoc/source/uriproc/UriReferenceFactory.hxx b/stoc/source/uriproc/UriReferenceFactory.hxx
index 39758d29421c..4a18d502467e 100644
--- a/stoc/source/uriproc/UriReferenceFactory.hxx
+++ b/stoc/source/uriproc/UriReferenceFactory.hxx
@@ -40,9 +40,9 @@ namespace UriReferenceFactory {
             const & context)
         SAL_THROW((com::sun::star::uno::Exception));
 
-    rtl::OUString SAL_CALL getImplementationName();
+    OUString SAL_CALL getImplementationName();
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames();
 }
 
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index ffeb1dbde867..d8545d692a0c 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -48,7 +48,7 @@
 
 namespace {
 
-bool parseSchemeSpecificPart(::rtl::OUString const & part) {
+bool parseSchemeSpecificPart(OUString const & part) {
     // Liberally accepts both an empty opaque_part and an opaque_part that
     // starts with a non-escaped "/":
     return part.isEmpty()
@@ -59,24 +59,24 @@ class UrlReference:
     public ::cppu::WeakImplHelper1< css::uri::XVndSunStarExpandUrlReference >
 {
 public:
-    UrlReference(::rtl::OUString const & scheme, ::rtl::OUString const & path):
+    UrlReference(OUString const & scheme, OUString const & path):
         base_(
-            scheme, false, false, ::rtl::OUString(), path, false,
-            ::rtl::OUString())
+            scheme, false, false, OUString(), path, false,
+            OUString())
     {}
 
-    virtual ::rtl::OUString SAL_CALL getUriReference()
+    virtual OUString SAL_CALL getUriReference()
         throw (css::uno::RuntimeException)
     { return base_.getUriReference(); }
 
     virtual ::sal_Bool SAL_CALL isAbsolute() throw (css::uno::RuntimeException)
     { return base_.isAbsolute(); }
 
-    virtual ::rtl::OUString SAL_CALL getScheme()
+    virtual OUString SAL_CALL getScheme()
         throw (css::uno::RuntimeException)
     { return base_.getScheme(); }
 
-    virtual ::rtl::OUString SAL_CALL getSchemeSpecificPart()
+    virtual OUString SAL_CALL getSchemeSpecificPart()
         throw (css::uno::RuntimeException)
     { return base_.getSchemeSpecificPart(); }
 
@@ -88,11 +88,11 @@ public:
         throw (css::uno::RuntimeException)
     { return base_.hasAuthority(); }
 
-    virtual ::rtl::OUString SAL_CALL getAuthority()
+    virtual OUString SAL_CALL getAuthority()
         throw (css::uno::RuntimeException)
     { return base_.getAuthority(); }
 
-    virtual ::rtl::OUString SAL_CALL getPath()
+    virtual OUString SAL_CALL getPath()
         throw (css::uno::RuntimeException)
     { return base_.getPath(); }
 
@@ -104,32 +104,32 @@ public:
         throw (css::uno::RuntimeException)
     { return base_.getPathSegmentCount(); }
 
-    virtual ::rtl::OUString SAL_CALL getPathSegment(sal_Int32 index)
+    virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
         throw (css::uno::RuntimeException)
     { return base_.getPathSegment(index); }
 
     virtual ::sal_Bool SAL_CALL hasQuery() throw (css::uno::RuntimeException)
     { return base_.hasQuery(); }
 
-    virtual ::rtl::OUString SAL_CALL getQuery()
+    virtual OUString SAL_CALL getQuery()
         throw (css::uno::RuntimeException)
     { return base_.getQuery(); }
 
     virtual ::sal_Bool SAL_CALL hasFragment() throw (css::uno::RuntimeException)
     { return base_.hasFragment(); }
 
-    virtual ::rtl::OUString SAL_CALL getFragment()
+    virtual OUString SAL_CALL getFragment()
         throw (css::uno::RuntimeException)
     { return base_.getFragment(); }
 
-    virtual void SAL_CALL setFragment(::rtl::OUString const & fragment)
+    virtual void SAL_CALL setFragment(OUString const & fragment)
         throw (css::uno::RuntimeException)
     { base_.setFragment(fragment); }
 
     virtual void SAL_CALL clearFragment() throw (css::uno::RuntimeException)
     { base_.clearFragment(); }
 
-    virtual ::rtl::OUString SAL_CALL expand(
+    virtual OUString SAL_CALL expand(
         css::uno::Reference< css::util::XMacroExpander > const & expander)
         throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
@@ -142,7 +142,7 @@ private:
     stoc::uriproc::UriReference base_;
 };
 
-::rtl::OUString UrlReference::expand(
+OUString UrlReference::expand(
     css::uno::Reference< css::util::XMacroExpander > const & expander)
     throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
 {
@@ -158,20 +158,20 @@ class Parser: public ::cppu::WeakImplHelper2<
 public:
     Parser() {}
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException);
 
     virtual ::sal_Bool SAL_CALL supportsService(
-        ::rtl::OUString const & serviceName)
+        OUString const & serviceName)
         throw (css::uno::RuntimeException);
 
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException);
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     parse(
-        ::rtl::OUString const & scheme,
-        ::rtl::OUString const & schemeSpecificPart)
+        OUString const & scheme,
+        OUString const & schemeSpecificPart)
         throw (css::uno::RuntimeException);
 
 private:
@@ -181,21 +181,21 @@ private:
     virtual ~Parser() {}
 };
 
-::rtl::OUString Parser::getImplementationName()
+OUString Parser::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand::
         getImplementationName();
 }
 
-::sal_Bool Parser::supportsService(::rtl::OUString const & serviceName)
+::sal_Bool Parser::supportsService(OUString const & serviceName)
     throw (css::uno::RuntimeException)
 {
     return ::stoc::uriproc::supportsService(
         getSupportedServiceNames(), serviceName);
 }
 
-css::uno::Sequence< ::rtl::OUString > Parser::getSupportedServiceNames()
+css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return ::stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTexpand::
@@ -203,7 +203,7 @@ css::uno::Sequence< ::rtl::OUString > Parser::getSupportedServiceNames()
 }
 
 css::uno::Reference< css::uri::XUriReference > Parser::parse(
-    ::rtl::OUString const & scheme, ::rtl::OUString const & schemeSpecificPart)
+    OUString const & scheme, OUString const & schemeSpecificPart)
     throw (css::uno::RuntimeException)
 {
     if (!parseSchemeSpecificPart(schemeSpecificPart)) {
@@ -213,7 +213,7 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse(
         return new UrlReference(scheme, schemeSpecificPart);
     } catch (::std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            ::rtl::OUString("std::bad_alloc"),
+            OUString("std::bad_alloc"),
             css::uno::Reference< css::uno::XInterface >());
     }
 }
@@ -232,19 +232,19 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< ::cppu::OWeakObject * >(new Parser);
     } catch (::std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            ::rtl::OUString("std::bad_alloc"),
+            OUString("std::bad_alloc"),
             css::uno::Reference< css::uno::XInterface >());
     }
 }
 
-::rtl::OUString getImplementationName() {
-    return ::rtl::OUString(
+OUString getImplementationName() {
+    return OUString(
             "com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
 }
 
-css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
-    css::uno::Sequence< ::rtl::OUString > s(1);
-    s[0] = ::rtl::OUString(
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+    css::uno::Sequence< OUString > s(1);
+    s[0] = OUString(
             "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand");
     return s;
 }
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 073d279dafb5..f82178fa57a1 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -52,7 +52,7 @@ int getHexWeight(sal_Unicode c) {
         : -1;
 }
 
-int parseEscaped(rtl::OUString const & part, sal_Int32 * index) {
+int parseEscaped(OUString const & part, sal_Int32 * index) {
     if (part.getLength() - *index < 3 || part[*index] != '%') {
         return -1;
     }
@@ -65,10 +65,10 @@ int parseEscaped(rtl::OUString const & part, sal_Int32 * index) {
     return (n1 << 4) | n2;
 }
 
-rtl::OUString parsePart(
-    rtl::OUString const & part, bool namePart, sal_Int32 * index)
+OUString parsePart(
+    OUString const & part, bool namePart, sal_Int32 * index)
 {
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     while (*index < part.getLength()) {
         sal_Unicode c = part[*index];
         if (namePart ? c == '?' : c == '&' || c == '=') {
@@ -140,7 +140,7 @@ rtl::OUString parsePart(
 
 namespace
 {
-    static rtl::OUString encodeNameOrParamFragment( rtl::OUString const & fragment )
+    static OUString encodeNameOrParamFragment( OUString const & fragment )
     {
         static sal_Bool const aCharClass[] =
         { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* NameOrParamFragment */
@@ -162,7 +162,7 @@ namespace
     }
 }
 
-bool parseSchemeSpecificPart(rtl::OUString const & part) {
+bool parseSchemeSpecificPart(OUString const & part) {
     sal_Int32 len = part.getLength();
     sal_Int32 i = 0;
     if (parsePart(part, true, &i).isEmpty() || part[0] == '/') {
@@ -193,12 +193,12 @@ class UrlReference:
     public cppu::WeakImplHelper1< css::uri::XVndSunStarScriptUrlReference >
 {
 public:
-    UrlReference(rtl::OUString const & scheme, rtl::OUString const & path):
+    UrlReference(OUString const & scheme, OUString const & path):
         m_base(
-            scheme, false, false, rtl::OUString(), path, false, rtl::OUString())
+            scheme, false, false, OUString(), path, false, OUString())
     {}
 
-    virtual rtl::OUString SAL_CALL getUriReference()
+    virtual OUString SAL_CALL getUriReference()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getUriReference(); }
 
@@ -206,11 +206,11 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.isAbsolute(); }
 
-    virtual rtl::OUString SAL_CALL getScheme()
+    virtual OUString SAL_CALL getScheme()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getScheme(); }
 
-    virtual rtl::OUString SAL_CALL getSchemeSpecificPart()
+    virtual OUString SAL_CALL getSchemeSpecificPart()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getSchemeSpecificPart(); }
 
@@ -222,11 +222,11 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.hasAuthority(); }
 
-    virtual rtl::OUString SAL_CALL getAuthority()
+    virtual OUString SAL_CALL getAuthority()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getAuthority(); }
 
-    virtual rtl::OUString SAL_CALL getPath()
+    virtual OUString SAL_CALL getPath()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getPath(); }
 
@@ -238,7 +238,7 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getPathSegmentCount(); }
 
-    virtual rtl::OUString SAL_CALL getPathSegment(sal_Int32 index)
+    virtual OUString SAL_CALL getPathSegment(sal_Int32 index)
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getPathSegment(index); }
 
@@ -246,7 +246,7 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.hasQuery(); }
 
-    virtual rtl::OUString SAL_CALL getQuery()
+    virtual OUString SAL_CALL getQuery()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getQuery(); }
 
@@ -254,11 +254,11 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.hasFragment(); }
 
-    virtual rtl::OUString SAL_CALL getFragment()
+    virtual OUString SAL_CALL getFragment()
         throw (com::sun::star::uno::RuntimeException)
     { return m_base.getFragment(); }
 
-    virtual void SAL_CALL setFragment(rtl::OUString const & fragment)
+    virtual void SAL_CALL setFragment(OUString const & fragment)
         throw (com::sun::star::uno::RuntimeException)
     { m_base.setFragment(fragment); }
 
@@ -266,18 +266,18 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { m_base.clearFragment(); }
 
-    virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
+    virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException);
 
-    virtual void SAL_CALL setName(rtl::OUString const & name)
+    virtual void SAL_CALL setName(OUString const & name)
         throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
 
-    virtual sal_Bool SAL_CALL hasParameter(rtl::OUString const & key)
+    virtual sal_Bool SAL_CALL hasParameter(OUString const & key)
         throw (css::uno::RuntimeException);
 
-    virtual rtl::OUString SAL_CALL getParameter(rtl::OUString const & key)
+    virtual OUString SAL_CALL getParameter(OUString const & key)
         throw (css::uno::RuntimeException);
 
-    virtual void SAL_CALL setParameter(rtl::OUString const & key, rtl::OUString const & value)
+    virtual void SAL_CALL setParameter(OUString const & key, OUString const & value)
         throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
 
 private:
@@ -286,54 +286,54 @@ private:
 
     virtual ~UrlReference() {}
 
-    sal_Int32 findParameter(rtl::OUString const & key);
+    sal_Int32 findParameter(OUString const & key);
 
     stoc::uriproc::UriReference m_base;
 };
 
-rtl::OUString UrlReference::getName() throw (css::uno::RuntimeException) {
+OUString UrlReference::getName() throw (css::uno::RuntimeException) {
     osl::MutexGuard g(m_base.m_mutex);
     sal_Int32 i = 0;
     return parsePart(m_base.m_path, true, &i);
 }
 
-void SAL_CALL UrlReference::setName(rtl::OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
+void SAL_CALL UrlReference::setName(OUString const & name) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
 {
     if (name.isEmpty())
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString(), *this, 1);
+            OUString(), *this, 1);
 
     osl::MutexGuard g(m_base.m_mutex);
     sal_Int32 i = 0;
     parsePart(m_base.m_path, true, &i);
 
-    rtl::OUStringBuffer newPath;
+    OUStringBuffer newPath;
     newPath.append(encodeNameOrParamFragment(name));
     newPath.append(m_base.m_path.copy(i));
     m_base.m_path = newPath.makeStringAndClear();
 }
 
-sal_Bool UrlReference::hasParameter(rtl::OUString const & key)
+sal_Bool UrlReference::hasParameter(OUString const & key)
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_base.m_mutex);
     return findParameter(key) >= 0;
 }
 
-rtl::OUString UrlReference::getParameter(rtl::OUString const & key)
+OUString UrlReference::getParameter(OUString const & key)
     throw (css::uno::RuntimeException)
 {
     osl::MutexGuard g(m_base.m_mutex);
     sal_Int32 i = findParameter(key);
-    return i >= 0 ? parsePart(m_base.m_path, false, &i) : rtl::OUString();
+    return i >= 0 ? parsePart(m_base.m_path, false, &i) : OUString();
 }
 
-void UrlReference::setParameter(rtl::OUString const & key, rtl::OUString const & value)
+void UrlReference::setParameter(OUString const & key, OUString const & value)
     throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
 {
     if (key.isEmpty())
         throw css::lang::IllegalArgumentException(
-            ::rtl::OUString(), *this, 1);
+            OUString(), *this, 1);
 
     osl::MutexGuard g(m_base.m_mutex);
     sal_Int32 i = findParameter(key);
@@ -342,7 +342,7 @@ void UrlReference::setParameter(rtl::OUString const & key, rtl::OUString const &
         i = m_base.m_path.getLength();
     }
 
-    rtl::OUStringBuffer newPath;
+    OUStringBuffer newPath;
     newPath.append(m_base.m_path.copy(0, i));
     if (!bExistent) {
         newPath.append(sal_Unicode(m_base.m_path.indexOf('?') < 0 ? '?' : '&'));
@@ -359,7 +359,7 @@ void UrlReference::setParameter(rtl::OUString const & key, rtl::OUString const &
     m_base.m_path = newPath.makeStringAndClear();
 }
 
-sal_Int32 UrlReference::findParameter(rtl::OUString const & key) {
+sal_Int32 UrlReference::findParameter(OUString const & key) {
     sal_Int32 i = 0;
     parsePart(m_base.m_path, true, &i); // skip name
     for (;;) {
@@ -367,7 +367,7 @@ sal_Int32 UrlReference::findParameter(rtl::OUString const & key) {
             return -1;
         }
         ++i; // skip '?' or '&'
-        rtl::OUString k = parsePart(m_base.m_path, false, &i);
+        OUString k = parsePart(m_base.m_path, false, &i);
         ++i; // skip '='
         if (k == key) {
             return i;
@@ -382,18 +382,18 @@ class Parser: public cppu::WeakImplHelper2<
 public:
     Parser() {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
         throw (css::uno::RuntimeException);
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException);
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
     parse(
-        rtl::OUString const & scheme, rtl::OUString const & schemeSpecificPart)
+        OUString const & scheme, OUString const & schemeSpecificPart)
         throw (css::uno::RuntimeException);
 
 private:
@@ -403,21 +403,21 @@ private:
     virtual ~Parser() {}
 };
 
-rtl::OUString Parser::getImplementationName()
+OUString Parser::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
         getImplementationName();
 }
 
-sal_Bool Parser::supportsService(rtl::OUString const & serviceName)
+sal_Bool Parser::supportsService(OUString const & serviceName)
     throw (css::uno::RuntimeException)
 {
     return stoc::uriproc::supportsService(
         getSupportedServiceNames(), serviceName);
 }
 
-css::uno::Sequence< rtl::OUString > Parser::getSupportedServiceNames()
+css::uno::Sequence< OUString > Parser::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return stoc_services::UriSchemeParser_vndDOTsunDOTstarDOTscript::
@@ -426,7 +426,7 @@ css::uno::Sequence< rtl::OUString > Parser::getSupportedServiceNames()
 
 css::uno::Reference< css::uri::XUriReference >
 Parser::parse(
-    rtl::OUString const & scheme, rtl::OUString const & schemeSpecificPart)
+    OUString const & scheme, OUString const & schemeSpecificPart)
     throw (css::uno::RuntimeException)
 {
     if (!parseSchemeSpecificPart(schemeSpecificPart)) {
@@ -436,7 +436,7 @@ Parser::parse(
         return new UrlReference(scheme, schemeSpecificPart);
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString("std::bad_alloc"), 0);
+            OUString("std::bad_alloc"), 0);
     }
 }
 
@@ -455,17 +455,17 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Parser);
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString("std::bad_alloc"), 0);
+            OUString("std::bad_alloc"), 0);
     }
 }
 
-rtl::OUString getImplementationName() {
-    return rtl::OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+OUString getImplementationName() {
+    return OUString("com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
 }
 
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
-    css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+    css::uno::Sequence< OUString > s(1);
+    s[0] = OUString("com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript");
     return s;
 }
 
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
index c6259e433deb..8393fc90c995 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.hxx
@@ -42,9 +42,9 @@ namespace UriSchemeParser_vndDOTsunDOTstarDOTscript {
             const &)
         SAL_THROW((com::sun::star::uno::Exception));
 
-    rtl::OUString SAL_CALL getImplementationName();
+    OUString SAL_CALL getImplementationName();
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames();
 }
 
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 2083d056715f..2dd5ac6f472d 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -55,13 +55,13 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & context):
         m_context(context) {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName)
         throw (css::uno::RuntimeException);
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException);
 
     virtual css::uno::Reference< css::uri::XUriReference > SAL_CALL
@@ -78,7 +78,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_context;
 };
 
-rtl::OUString Factory::getImplementationName()
+OUString Factory::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return
@@ -86,14 +86,14 @@ rtl::OUString Factory::getImplementationName()
         getImplementationName();
 }
 
-sal_Bool Factory::supportsService(rtl::OUString const & serviceName)
+sal_Bool Factory::supportsService(OUString const & serviceName)
     throw (css::uno::RuntimeException)
 {
     return stoc::uriproc::supportsService(
         getSupportedServiceNames(), serviceName);
 }
 
-css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames()
+css::uno::Sequence< OUString > Factory::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return stoc_services::VndSunStarPkgUrlReferenceFactory::
@@ -107,7 +107,7 @@ Factory::createVndSunStarPkgUrlReference(
 {
     OSL_ASSERT(authority.is());
     if (authority->isAbsolute() && !authority->hasFragment()) {
-        rtl::OUStringBuffer buf;
+        OUStringBuffer buf;
         buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg://"));
         buf.append(
             rtl::Uri::encode(
@@ -136,17 +136,17 @@ css::uno::Reference< css::uno::XInterface > create(
         return static_cast< cppu::OWeakObject * >(new Factory(context));
     } catch (std::bad_alloc &) {
         throw css::uno::RuntimeException(
-            rtl::OUString("std::bad_alloc"), 0);
+            OUString("std::bad_alloc"), 0);
     }
 }
 
-rtl::OUString getImplementationName() {
-    return rtl::OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
+OUString getImplementationName() {
+    return OUString("com.sun.star.comp.uri.VndSunStarPkgUrlReferenceFactory");
 }
 
-css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
-    css::uno::Sequence< rtl::OUString > s(1);
-    s[0] = rtl::OUString("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory");
+css::uno::Sequence< OUString > getSupportedServiceNames() {
+    css::uno::Sequence< OUString > s(1);
+    s[0] = OUString("com.sun.star.uri.VndSunStarPkgUrlReferenceFactory");
     return s;
 }
 
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
index aac2adaf7dd0..01da290700ad 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.hxx
@@ -40,9 +40,9 @@ namespace VndSunStarPkgUrlReferenceFactory {
             const & context)
         SAL_THROW((com::sun::star::uno::Exception));
 
-    rtl::OUString SAL_CALL getImplementationName();
+    OUString SAL_CALL getImplementationName();
 
-    com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames();
 }
 
diff --git a/stoc/source/uriproc/supportsService.cxx b/stoc/source/uriproc/supportsService.cxx
index d20f5749e8b6..b5a835f47c0d 100644
--- a/stoc/source/uriproc/supportsService.cxx
+++ b/stoc/source/uriproc/supportsService.cxx
@@ -27,8 +27,8 @@
 namespace stoc { namespace uriproc {
 
 bool supportsService(
-    com::sun::star::uno::Sequence< rtl::OUString > const & serviceNames,
-    rtl::OUString const & serviceName)
+    com::sun::star::uno::Sequence< OUString > const & serviceNames,
+    OUString const & serviceName)
 {
     for (sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {
         if (serviceNames[i] == serviceName) {
diff --git a/stoc/source/uriproc/supportsService.hxx b/stoc/source/uriproc/supportsService.hxx
index c410360eee96..2ca3a5321463 100644
--- a/stoc/source/uriproc/supportsService.hxx
+++ b/stoc/source/uriproc/supportsService.hxx
@@ -27,8 +27,8 @@ namespace rtl { class OUString; }
 namespace stoc { namespace uriproc {
 
 bool supportsService(
-    com::sun::star::uno::Sequence< rtl::OUString > const & serviceNames,
-    rtl::OUString const & serviceName);
+    com::sun::star::uno::Sequence< OUString > const & serviceNames,
+    OUString const & serviceName);
 
 } }