mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

5 files changed, 64 insertions, 69 deletions

diff --git a/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx
index 615e5c0f19e4..f31be4b142f6 100644
--- a/sax/inc/sax/fastattribs.hxx
+++ b/sax/inc/sax/fastattribs.hxx
@@ -36,18 +36,18 @@ namespace sax_fastparser
 
 struct UnknownAttribute
 {
-    ::rtl::OUString maNamespaceURL;
-    ::rtl::OString maName;
-    ::rtl::OString maValue;
+    OUString maNamespaceURL;
+    OString maName;
+    OString maValue;
 
-    UnknownAttribute( const ::rtl::OUString& rNamespaceURL, const ::rtl::OString& rName, const ::rtl::OString& rValue );
+    UnknownAttribute( const OUString& rNamespaceURL, const OString& rName, const OString& rValue );
 
-    UnknownAttribute( const ::rtl::OString& rName, const ::rtl::OString& rValue );
+    UnknownAttribute( const OString& rName, const OString& rValue );
 
     void FillAttribute( ::com::sun::star::xml::Attribute* pAttrib ) const;
 };
 
-typedef std::map< sal_Int32, ::rtl::OString > FastAttributeMap;
+typedef std::map< sal_Int32, OString > FastAttributeMap;
 typedef std::vector< UnknownAttribute > UnknownAttributeList;
 
 class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastAttributeList >
@@ -57,16 +57,16 @@ public:
     virtual ~FastAttributeList();
 
     void clear();
-    void add( sal_Int32 nToken, const ::rtl::OString& rValue );
-    void addUnknown( const ::rtl::OUString& rNamespaceURL, const ::rtl::OString& rName, const ::rtl::OString& rValue );
-    void addUnknown( const ::rtl::OString& rName, const ::rtl::OString& rValue );
+    void add( sal_Int32 nToken, const OString& rValue );
+    void addUnknown( const OUString& rNamespaceURL, const OString& rName, const OString& rValue );
+    void addUnknown( const OString& rName, const OString& rValue );
 
     // XFastAttributeList
     virtual ::sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getValueToken( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getOptionalValueToken( ::sal_Int32 Token, ::sal_Int32 Default ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getValue( ::sal_Int32 Token ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getOptionalValue( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::Attribute > SAL_CALL getUnknownAttributes(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::xml::FastAttribute > SAL_CALL getFastAttributes() throw (::com::sun::star::uno::RuntimeException);
 
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 2e9d07b7ce26..e0945fc07ddf 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -125,13 +125,13 @@ public:
         { startElement( FSNS( namespaceTokenId, elementTokenId ), xAttrList ); }
 
     FastSerializerHelper* write(const char* value);
-    FastSerializerHelper* write(const rtl::OUString& value);
+    FastSerializerHelper* write(const OUString& value);
     FastSerializerHelper* write(sal_Int32 value);
     FastSerializerHelper* write(sal_Int64 value);
     FastSerializerHelper* write(double value);
 
     FastSerializerHelper* writeEscaped(const char* value);
-    FastSerializerHelper* writeEscaped(const rtl::OUString& value);
+    FastSerializerHelper* writeEscaped(const OUString& value);
 
     FastSerializerHelper* writeId(sal_Int32 tokenId);
 
diff --git a/sax/inc/sax/tools/converter.hxx b/sax/inc/sax/tools/converter.hxx
index 30aaea614bf6..615308c9e418 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/sax/inc/sax/tools/converter.hxx
@@ -23,17 +23,12 @@
 #include "sax/saxdllapi.h"
 
 #include <sal/types.h>
-
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/util/MeasureUnit.hpp>
 
 
-namespace rtl
-{
-class OUString;
-class OUStringBuffer;
-}
-
 namespace com { namespace sun { namespace star {
     namespace uno {
         class Any;
@@ -60,114 +55,114 @@ class SAX_DLLPUBLIC Converter
 public:
     /** convert string to measure using optional min and max values*/
     static bool convertMeasure( sal_Int32& rValue,
-                                const ::rtl::OUString& rString,
+                                const OUString& rString,
                                 sal_Int16 nTargetUnit = ::com::sun::star::util::MeasureUnit::MM_100TH,
                                 sal_Int32 nMin = SAL_MIN_INT32,
                                 sal_Int32 nMax = SAL_MAX_INT32 );
 
     /** convert measure to string */
-    static void convertMeasure( ::rtl::OUStringBuffer& rBuffer,
+    static void convertMeasure( OUStringBuffer& rBuffer,
                                 sal_Int32 nMeasure,
                                 sal_Int16 SourceUnit = ::com::sun::star::util::MeasureUnit::MM_100TH,
                                 sal_Int16 nTargetUnit = ::com::sun::star::util::MeasureUnit::INCH  );
 
     /** convert string to boolean */
     static bool convertBool( bool& rBool,
-                             const ::rtl::OUString& rString );
+                             const OUString& rString );
 
     /** convert boolean to string */
-    static void convertBool( ::rtl::OUStringBuffer& rBuffer,
+    static void convertBool( OUStringBuffer& rBuffer,
                              bool bValue );
 
     /** convert string to percent */
     static bool convertPercent( sal_Int32& rValue,
-                                const ::rtl::OUString& rString );
+                                const OUString& rString );
 
     /** convert percent to string */
-    static void convertPercent( ::rtl::OUStringBuffer& rBuffer,
+    static void convertPercent( OUStringBuffer& rBuffer,
                                 sal_Int32 nValue );
 
     /** convert string to pixel measure unite */
     static bool convertMeasurePx( sal_Int32& rValue,
-                                  const ::rtl::OUString& rString );
+                                  const OUString& rString );
 
     /** convert pixel measure unit to string */
-    static void convertMeasurePx( ::rtl::OUStringBuffer& rBuffer,
+    static void convertMeasurePx( OUStringBuffer& rBuffer,
                                   sal_Int32 nValue );
 
     /** convert string to rgb color */
     static bool convertColor( sal_Int32& rColor,
-                              const ::rtl::OUString&rValue );
+                              const OUString&rValue );
 
     /** convert color to string */
-    static void convertColor( ::rtl::OUStringBuffer &rBuffer,
+    static void convertColor( OUStringBuffer &rBuffer,
                               sal_Int32 nColor );
 
     /** convert number to string */
-    static void convertNumber( ::rtl::OUStringBuffer& rBuffer,
+    static void convertNumber( OUStringBuffer& rBuffer,
                                sal_Int32 nNumber );
 
     /** convert string to number with optional min and max values */
     static bool convertNumber( sal_Int32& rValue,
-                               const ::rtl::OUString& rString,
+                               const OUString& rString,
                                sal_Int32 nMin = SAL_MIN_INT32,
                                sal_Int32 nMax = SAL_MAX_INT32 );
 
     /** convert string to number with optional min and max values */
     static bool convertNumber64(sal_Int64& rValue,
-                                const ::rtl::OUString& rString,
+                                const OUString& rString,
                                 sal_Int64 nMin = SAL_MIN_INT64,
                                 sal_Int64 nMax = SAL_MAX_INT64);
 
     /** convert double number to string (using ::rtl::math) and
         DO convert from source unit to target unit */
-    static void convertDouble( ::rtl::OUStringBuffer& rBuffer,
+    static void convertDouble( OUStringBuffer& rBuffer,
                                double fNumber,
                                bool bWriteUnits,
                                sal_Int16 nSourceUnit,
                                sal_Int16 nTargetUnit );
 
     /** convert double number to string (using ::rtl::math) without unit conversion */
-    static void convertDouble( ::rtl::OUStringBuffer& rBuffer, double fNumber);
+    static void convertDouble( OUStringBuffer& rBuffer, double fNumber);
 
     /** convert string to double number (using ::rtl::math) and DO convert from
         source unit to target unit. */
     static bool convertDouble(  double& rValue,
-                                const ::rtl::OUString& rString,
+                                const OUString& rString,
                                 sal_Int16 nSourceUnit,
                                 sal_Int16 nTargetUnit );
 
     /** convert string to double number (using ::rtl::math) without unit conversion */
-    static bool convertDouble(double& rValue, const ::rtl::OUString& rString);
+    static bool convertDouble(double& rValue, const OUString& rString);
 
     /** convert double to ISO "duration" string; negative durations allowed */
-    static void convertDuration(::rtl::OUStringBuffer& rBuffer,
+    static void convertDuration(OUStringBuffer& rBuffer,
                                 const double fTime);
 
     /** convert util::Duration to ISO "duration" string */
-    static void convertDuration(::rtl::OUStringBuffer& rBuffer,
+    static void convertDuration(OUStringBuffer& rBuffer,
                         const ::com::sun::star::util::Duration& rDuration);
 
     /** convert ISO "duration" string to double; negative durations allowed */
     static bool convertDuration(double & rfTime,
-                                const ::rtl::OUString& rString);
+                                const OUString& rString);
 
     /** convert ISO "duration" string to util::Duration */
     static bool convertDuration(::com::sun::star::util::Duration& rDuration,
-                        const ::rtl::OUString& rString);
+                        const OUString& rString);
 
     /** convert util::Date to ISO "date" string */
-    static void convertDate( ::rtl::OUStringBuffer& rBuffer,
+    static void convertDate( OUStringBuffer& rBuffer,
                     const com::sun::star::util::Date& rDate );
 
     /** convert util::DateTime to ISO "date" or "dateTime" string */
-    static void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
+    static void convertDateTime( OUStringBuffer& rBuffer,
                                 const com::sun::star::util::DateTime& rDateTime,
                                    bool bAddTimeIf0AM = false );
 
     /** convert ISO "date" or "dateTime" string to util::DateTime */
     static bool convertDateTime( com::sun::star::util::DateTime& rDateTime,
-                                 const ::rtl::OUString& rString );
+                                 const OUString& rString );
 
     /** convert ISO "date" or "dateTime" string to util::DateTime or
         util::Date */
@@ -175,31 +170,31 @@ public:
                     com::sun::star::util::Date & rDate,
                     com::sun::star::util::DateTime & rDateTime,
                     bool & rbDateTime,
-                    const ::rtl::OUString & rString );
+                    const OUString & rString );
 
     /** gets the position of the first comma after npos in the string
         rStr. Commas inside '"' pairs are not matched */
-    static sal_Int32 indexOfComma( const ::rtl::OUString& rStr,
+    static sal_Int32 indexOfComma( const OUString& rStr,
                                    sal_Int32 nPos );
 
     /** encodes the given byte sequence into Base64 */
-    static void encodeBase64(rtl::OUStringBuffer& aStrBuffer, const com::sun::star::uno::Sequence<sal_Int8>& aPass);
+    static void encodeBase64(OUStringBuffer& aStrBuffer, const com::sun::star::uno::Sequence<sal_Int8>& aPass);
 
     // Decode a base 64 encoded string into a sequence of bytes. The first
     // version can be used for attribute values only, bacause it does not
     // return any chars left from conversion.
     // For text submitted throgh the SAX characters call, the later method
     // must be used!
-    static void decodeBase64(com::sun::star::uno::Sequence<sal_Int8>& aPass, const rtl::OUString& sBuffer);
+    static void decodeBase64(com::sun::star::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer);
 
-    static sal_Int32 decodeBase64SomeChars(com::sun::star::uno::Sequence<sal_Int8>& aPass, const rtl::OUString& sBuffer);
+    static sal_Int32 decodeBase64SomeChars(com::sun::star::uno::Sequence<sal_Int8>& aPass, const OUString& sBuffer);
 
-    static double GetConversionFactor(::rtl::OUStringBuffer& rUnit, sal_Int16 nSourceUnit, sal_Int16 nTargetUnit);
-    static sal_Int16 GetUnitFromString(const ::rtl::OUString& rString, sal_Int16 nDefaultUnit);
+    static double GetConversionFactor(OUStringBuffer& rUnit, sal_Int16 nSourceUnit, sal_Int16 nTargetUnit);
+    static sal_Int16 GetUnitFromString(const OUString& rString, sal_Int16 nDefaultUnit);
 
     /** convert an Any to string (typesafe) */
-    static bool convertAny(::rtl::OUStringBuffer&          rsValue,
-                           ::rtl::OUStringBuffer&          rsType ,
+    static bool convertAny(OUStringBuffer&          rsValue,
+                           OUStringBuffer&          rsType ,
                            const ::com::sun::star::uno::Any& rValue);
 
 };
diff --git a/sax/inc/sax/tools/documenthandleradapter.hxx b/sax/inc/sax/tools/documenthandleradapter.hxx
index 3e8705c6f951..5867bbbb9cac 100644
--- a/sax/inc/sax/tools/documenthandleradapter.hxx
+++ b/sax/inc/sax/tools/documenthandleradapter.hxx
@@ -61,7 +61,7 @@ namespace sax
         }
 
         virtual void SAL_CALL
-        startElement(const ::rtl::OUString& aName,
+        startElement(const OUString& aName,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
                 throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
         {
@@ -69,27 +69,27 @@ namespace sax
         }
 
         virtual void SAL_CALL
-        endElement(const ::rtl::OUString& aName) throw (::com::sun::star::xml::sax::SAXException,
+        endElement(const OUString& aName) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->endElement(aName);
         }
 
         virtual void SAL_CALL
-        characters(const ::rtl::OUString& aChars) throw (::com::sun::star::xml::sax::SAXException,
+        characters(const OUString& aChars) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->characters(aChars);
         }
 
         virtual void SAL_CALL
-        ignorableWhitespace(const ::rtl::OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException,
+        ignorableWhitespace(const OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->ignorableWhitespace(aWhitespaces);
         }
         virtual void SAL_CALL
-        processingInstruction(const ::rtl::OUString& aTarget, const ::rtl::OUString& aData)
+        processingInstruction(const OUString& aTarget, const OUString& aData)
                 throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
         {
             m_handler->processingInstruction(aTarget, aData);
@@ -153,7 +153,7 @@ namespace sax
         }
 
         virtual void SAL_CALL
-        startElement(const ::rtl::OUString& aName,
+        startElement(const OUString& aName,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs)
                 throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
         {
@@ -161,27 +161,27 @@ namespace sax
         }
 
         virtual void SAL_CALL
-        endElement(const ::rtl::OUString& aName) throw (::com::sun::star::xml::sax::SAXException,
+        endElement(const OUString& aName) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->endElement(aName);
         }
 
         virtual void SAL_CALL
-        characters(const ::rtl::OUString& aChars) throw (::com::sun::star::xml::sax::SAXException,
+        characters(const OUString& aChars) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->characters(aChars);
         }
 
         virtual void SAL_CALL
-        ignorableWhitespace(const ::rtl::OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException,
+        ignorableWhitespace(const OUString& aWhitespaces) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->ignorableWhitespace(aWhitespaces);
         }
         virtual void SAL_CALL
-        processingInstruction(const ::rtl::OUString& aTarget, const ::rtl::OUString& aData)
+        processingInstruction(const OUString& aTarget, const OUString& aData)
                 throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
         {
             m_handler->processingInstruction(aTarget, aData);
@@ -204,13 +204,13 @@ namespace sax
             m_handler->endCDATA();
         }
         virtual void SAL_CALL
-        comment(const ::rtl::OUString& sComment) throw (::com::sun::star::xml::sax::SAXException,
+        comment(const OUString& sComment) throw (::com::sun::star::xml::sax::SAXException,
                 ::com::sun::star::uno::RuntimeException)
         {
             m_handler->comment(sComment);
         }
         virtual void SAL_CALL
-        unknown(const ::rtl::OUString& sString) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
+        unknown(const OUString& sString) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException)
         {
             m_handler->unknown(sString);
         }
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 9a6ee23e6ca3..bb1f6aca2dee 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -25,7 +25,7 @@ class Text2UnicodeConverter
 {
 
 public:
-    Text2UnicodeConverter( const ::rtl::OString & sEncoding );
+    Text2UnicodeConverter( const OString & sEncoding );
     ~Text2UnicodeConverter();
 
     ::com::sun::star::uno::Sequence < sal_Unicode > convert( const ::com::sun::star::uno::Sequence<sal_Int8> & );
@@ -53,7 +53,7 @@ public:
     Unicode2TextConverter( rtl_TextEncoding encoding );
     ~Unicode2TextConverter();
 
-    inline ::com::sun::star::uno::Sequence<sal_Int8> convert( const ::rtl::OUString &s )
+    inline ::com::sun::star::uno::Sequence<sal_Int8> convert( const OUString &s )
         {
             return convert( s.getStr() , s.getLength() );
         }
@@ -90,7 +90,7 @@ public:
     ~XMLFile2UTFConverter();
 
     void setInputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > &r ) { m_in = r; }
-    void setEncoding( const ::rtl::OString &s ) { m_sEncoding = s; }
+    void setEncoding( const OString &s ) { m_sEncoding = s; }
 
 
 
@@ -124,7 +124,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >  m_in;
 
     sal_Bool m_bStarted;
-    ::rtl::OString m_sEncoding;
+    OString m_sEncoding;
 
     Text2UnicodeConverter *m_pText2Unicode;
     Unicode2TextConverter *m_pUnicode2Text;