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, 32 insertions, 33 deletions

diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 94721d9e21cb..f849b133db16 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -39,20 +39,20 @@ public:
     // XMimeContentTypeFactory
     //------------------------------------------------
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const ::rtl::OUString& aContentType )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType )
         throw(::com::sun::star::lang::IllegalArgumentException, ::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);
 
 private:
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 771422fd0263..129370196fd3 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -29,7 +29,6 @@ using namespace com::sun::star::container;
 using namespace std;
 using namespace osl;
 
-using ::rtl::OUString;
 
 //------------------------------------------------------------------------
 // constants
@@ -183,7 +182,7 @@ void SAL_CALL CMimeContentType::type( void )
 {
     skipSpaces( );
 
-    rtl::OUString sToken(TOKEN);
+    OUString sToken(TOKEN);
 
     // check FIRST( type )
     if ( !isInRange( m_nxtSym, sToken ) )
@@ -216,7 +215,7 @@ void SAL_CALL CMimeContentType::subtype( void )
 {
     skipSpaces( );
 
-    rtl::OUString sToken(TOKEN);
+    OUString sToken(TOKEN);
 
     // check FIRST( subtype )
     if ( !isInRange( m_nxtSym, sToken ) )
@@ -244,7 +243,7 @@ void SAL_CALL CMimeContentType::subtype( void )
 
 void SAL_CALL CMimeContentType::trailer( void )
 {
-    rtl::OUString sToken(TOKEN);
+    OUString sToken(TOKEN);
     while( !m_nxtSym.isEmpty( ) )
     {
         if ( m_nxtSym == OUString("(") )
@@ -291,7 +290,7 @@ OUString SAL_CALL CMimeContentType::pName( )
 {
     OUString pname;
 
-    rtl::OUString sToken(TOKEN);
+    OUString sToken(TOKEN);
     while( !m_nxtSym.isEmpty( ) )
     {
         if ( isInRange( m_nxtSym, sToken ) )
@@ -314,7 +313,7 @@ OUString SAL_CALL CMimeContentType::pValue( )
 {
     OUString pvalue;
 
-    rtl::OUString sToken(TOKEN);
+    OUString sToken(TOKEN);
     // quoted pvalue
     if ( m_nxtSym == OUString( "\"" ) )
     {
@@ -360,7 +359,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
         {
             break;
         }
-        else if ( isInRange( m_nxtSym, rtl::OUString(TOKEN) + rtl::OUString(TSPECIALS) + rtl::OUString(SPACE) ) )
+        else if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(TSPECIALS) + OUString(SPACE) ) )
         {
             pvalue += m_nxtSym;
             if ( m_nxtSym == OUString( "\"" ) )
@@ -384,7 +383,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
 {
     OUString pvalue;
 
-    rtl::OUString sToken(TOKEN);
+    OUString sToken(TOKEN);
     while ( !m_nxtSym.isEmpty( ) )
     {
         if ( isInRange( m_nxtSym, sToken ) )
@@ -407,7 +406,7 @@ void SAL_CALL CMimeContentType::comment( void )
 {
     while ( !m_nxtSym.isEmpty( ) )
     {
-        if ( isInRange( m_nxtSym, rtl::OUString(TOKEN) + rtl::OUString(SPACE) ) )
+        if ( isInRange( m_nxtSym, OUString(TOKEN) + OUString(SPACE) ) )
             getSym( );
         else if ( m_nxtSym == OUString(")") )
             break;
@@ -420,7 +419,7 @@ void SAL_CALL CMimeContentType::comment( void )
 //
 //------------------------------------------------------------------------
 
-sal_Bool SAL_CALL CMimeContentType::isInRange( const rtl::OUString& aChr, const rtl::OUString& aRange )
+sal_Bool SAL_CALL CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange )
 {
     return ( aRange.indexOf( aChr ) > -1 );
 }
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index b3f65e16df50..28cfa2efec0a 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -33,48 +33,48 @@ class CMimeContentType : public
     cppu::WeakImplHelper1< com::sun::star::datatransfer::XMimeContentType >
 {
 public:
-    CMimeContentType( const rtl::OUString& aCntType );
+    CMimeContentType( const OUString& aCntType );
 
     //-------------------------------------------
     // XMimeContentType
     //-------------------------------------------
 
-    virtual ::rtl::OUString SAL_CALL getMediaType(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getMediaSubtype(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getFullMediaType(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getMediaType(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getMediaSubtype(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getFullMediaType(  ) throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getParameters(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getParameters(  )
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL hasParameter( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasParameter( const OUString& aName )
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getParameterValue( const ::rtl::OUString& aName )
+    virtual OUString SAL_CALL getParameterValue( const OUString& aName )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
 
 private:
-    void SAL_CALL init( const rtl::OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException );
+    void SAL_CALL init( const OUString& aCntType ) throw( com::sun::star::lang::IllegalArgumentException );
     void SAL_CALL getSym( void );
-    void SAL_CALL acceptSym( const rtl::OUString& pSymTlb );
+    void SAL_CALL acceptSym( const OUString& pSymTlb );
     void SAL_CALL skipSpaces( void );
     void SAL_CALL type( void );
     void SAL_CALL subtype( void );
     void SAL_CALL trailer( void );
-    rtl::OUString SAL_CALL pName( );
-    rtl::OUString SAL_CALL pValue( );
-    rtl::OUString SAL_CALL quotedPValue( );
-    rtl::OUString SAL_CALL nonquotedPValue( );
+    OUString SAL_CALL pName( );
+    OUString SAL_CALL pValue( );
+    OUString SAL_CALL quotedPValue( );
+    OUString SAL_CALL nonquotedPValue( );
     void SAL_CALL comment( void );
-    sal_Bool SAL_CALL isInRange( const rtl::OUString& aChr, const rtl::OUString& aRange );
+    sal_Bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange );
 
 private:
     ::osl::Mutex                             m_aMutex;
-    rtl::OUString                            m_MediaType;
-    rtl::OUString                            m_MediaSubtype;
-    rtl::OUString                            m_ContentType;
-    std::map< rtl::OUString, rtl::OUString > m_ParameterMap;
+    OUString                            m_MediaType;
+    OUString                            m_MediaSubtype;
+    OUString                            m_ContentType;
+    std::map< OUString, OUString > m_ParameterMap;
     sal_Int32                                m_nPos;
-    rtl::OUString                            m_nxtSym;
+    OUString                            m_nxtSym;
 };
 
 #endif