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

3 files changed, 7 insertions, 8 deletions

diff --git a/xmlreader/inc/xmlreader/pad.hxx b/xmlreader/inc/xmlreader/pad.hxx
index 886af52b1945..0b8e1f3b7453 100644
--- a/xmlreader/inc/xmlreader/pad.hxx
+++ b/xmlreader/inc/xmlreader/pad.hxx
@@ -43,7 +43,7 @@ private:
     SAL_DLLPRIVATE void flushSpan();
 
     Span span_;
-    rtl::OStringBuffer buffer_;
+    OStringBuffer buffer_;
 };
 
 }
diff --git a/xmlreader/inc/xmlreader/span.hxx b/xmlreader/inc/xmlreader/span.hxx
index b8c28db0f42b..4f3e4d1c285d 100644
--- a/xmlreader/inc/xmlreader/span.hxx
+++ b/xmlreader/inc/xmlreader/span.hxx
@@ -24,11 +24,10 @@
 
 #include "rtl/string.hxx"
 #include "rtl/stringutils.hxx"
+#include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "xmlreader/detail/xmlreaderdllapi.hxx"
 
-namespace rtl { class OUString; }
-
 namespace xmlreader {
 
 struct OOO_DLLPUBLIC_XMLREADER Span {
@@ -54,7 +53,7 @@ struct OOO_DLLPUBLIC_XMLREADER Span {
         return equals(Span(textBegin, textLength));
     }
 
-    inline bool equals(rtl::OString const & text) const {
+    inline bool equals(OString const & text) const {
         return rtl_str_compare_WithLength(
             begin, length, text.getStr(), text.getLength()) == 0;
     }
@@ -70,7 +69,7 @@ struct OOO_DLLPUBLIC_XMLREADER Span {
         return rtl_str_compare_WithLength( begin, length, literal, rtl::internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
     }
 
-    rtl::OUString convertFromUtf8() const;
+    OUString convertFromUtf8() const;
 };
 
 }
diff --git a/xmlreader/inc/xmlreader/xmlreader.hxx b/xmlreader/inc/xmlreader/xmlreader.hxx
index b6de02734e84..90770a9432da 100644
--- a/xmlreader/inc/xmlreader/xmlreader.hxx
+++ b/xmlreader/inc/xmlreader/xmlreader.hxx
@@ -39,7 +39,7 @@ namespace xmlreader {
 
 class OOO_DLLPUBLIC_XMLREADER XmlReader: private boost::noncopyable {
 public:
-    explicit XmlReader(rtl::OUString const & fileUrl)
+    explicit XmlReader(OUString const & fileUrl)
         SAL_THROW((
             com::sun::star::container::NoSuchElementException,
             com::sun::star::uno::RuntimeException));
@@ -67,7 +67,7 @@ public:
 
     int getNamespaceId(Span const & prefix) const;
 
-    rtl::OUString getUrl() const;
+    OUString getUrl() const;
 
 private:
     typedef std::vector< Span > NamespaceIris;
@@ -170,7 +170,7 @@ private:
 
     SAL_DLLPRIVATE int toNamespaceId(NamespaceIris::size_type pos);
 
-    rtl::OUString fileUrl_;
+    OUString fileUrl_;
     oslFileHandle fileHandle_;
     sal_uInt64 fileSize_;
     void * fileAddress_;