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

6 files changed, 55 insertions, 57 deletions

diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 87e7e98787db..d5124155c8a2 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -158,7 +158,7 @@ sal_uInt32 Ppt97Animation::GetSoundRef() const
 {
     return m_aAtom.nSoundRef;
 }
-void Ppt97Animation::SetSoundFileUrl( const ::rtl::OUString& rSoundFileUrl )
+void Ppt97Animation::SetSoundFileUrl( const OUString& rSoundFileUrl )
 {
     m_aSoundFileUrl = rSoundFileUrl;
 }
@@ -256,12 +256,12 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const
     }
     return nRet;
 }
-::rtl::OUString Ppt97Animation::GetPresetId() const
+OUString Ppt97Animation::GetPresetId() const
 {
     UpdateCacheData();
     return m_aPresetId;
 }
-::rtl::OUString Ppt97Animation::GetPresetSubType() const
+OUString Ppt97Animation::GetPresetSubType() const
 {
     UpdateCacheData();
     return m_aSubType;
@@ -269,7 +269,7 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const
 
 void Ppt97Animation::ClearCacheData() const
 {
-    m_aPresetId = m_aSubType = rtl::OUString();
+    m_aPresetId = m_aSubType = OUString();
     m_bHasSpecialDuration = false;
     m_fDurationInSeconds = 0.001;
 }
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index 8a876f1f0227..dc653895c97b 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -104,7 +104,7 @@ public: //public methods
 
     //set methods
     void SetDimColor( sal_Int32 nDimColor );
-    void SetSoundFileUrl( const ::rtl::OUString& rSoundFileUrl );
+    void SetSoundFileUrl( const OUString& rSoundFileUrl );
     void SetAnimateAssociatedShape( bool bAnimate ); //true if the shape should be animated in addition to the text
 
     //action methods
@@ -116,8 +116,8 @@ public: //public methods
 private: //private methods
 
     //read methods
-    ::rtl::OUString GetPresetId() const;
-    ::rtl::OUString GetPresetSubType() const;
+    OUString GetPresetId() const;
+    OUString GetPresetSubType() const;
     bool HasAfterEffect() const;
     bool HasAfterEffect_ChangeColor() const;
     bool HasAfterEffect_DimAtNextEffect() const;
@@ -146,12 +146,12 @@ private: //private methods
 private: //private member
     //input information:
     Ppt97AnimationInfoAtom  m_aAtom;         ///< pure input from stream
-    ::rtl::OUString         m_aSoundFileUrl; ///< this needs to be set in addition from outside as this class has not the knowledge to translate the sound bits to a file url
+    OUString         m_aSoundFileUrl; ///< this needs to be set in addition from outside as this class has not the knowledge to translate the sound bits to a file url
 
     //cached generated output information:
     mutable bool            m_bDirtyCache;
-    mutable ::rtl::OUString m_aPresetId; // m_aPresetId and m_aSubType match to the values in sd/xml/effects.xml
-    mutable ::rtl::OUString m_aSubType;
+    mutable OUString m_aPresetId; // m_aPresetId and m_aSubType match to the values in sd/xml/effects.xml
+    mutable OUString m_aSubType;
     mutable bool            m_bHasSpecialDuration;
     mutable double          m_fDurationInSeconds;
 };
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 92054bd6ddb5..04abeeecd920 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -242,7 +242,7 @@ struct transition
     sal_Int16 mnSubType;
     sal_Bool mbDirection; // true: default geometric direction
 
-    static const transition* find( const rtl::OUString& rName );
+    static const transition* find( const OUString& rName );
     static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const sal_Bool bDirection );
 };
 static const transition gTransitions[] =
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 9dc25d8af73b..1bbb9155c80f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -126,7 +126,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto
 #endif
 
     PowerPointImportParam aParam( rDocStream, nImportFlags );
-    SvStream* pCurrentUserStream = rStorage.OpenSotStream( rtl::OUString( "Current User" ), STREAM_STD_READ );
+    SvStream* pCurrentUserStream = rStorage.OpenSotStream( OUString( "Current User" ), STREAM_STD_READ );
     if( pCurrentUserStream )
     {
         *pCurrentUserStream >> aParam.aCurrentUserAtom;
@@ -183,7 +183,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage
         {
             sal_uLong nPosMerk = rStCtrl.Tell();
 
-            pStData = rStorage_.OpenSotStream( rtl::OUString( "Pictures" ), STREAM_STD_READ );
+            pStData = rStorage_.OpenSotStream( OUString( "Pictures" ), STREAM_STD_READ );
 
             rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 );
             sal_uLong nDocLen = maDocHd.GetRecEndFilePos();
@@ -257,7 +257,7 @@ sal_Bool ImplSdPPTImport::Import()
         SeekOle( pDocShell, mnFilterOptions );
 
     // hyperlinks
-    PropRead* pDInfoSec2 = new PropRead( mrStorage, rtl::OUString( "\005DocumentSummaryInformation" ) );
+    PropRead* pDInfoSec2 = new PropRead( mrStorage, OUString( "\005DocumentSummaryInformation" ) );
     if ( pDInfoSec2->IsValid() )
     {
         PropItem aPropItem;
@@ -358,7 +358,7 @@ sal_Bool ImplSdPPTImport::Import()
                 Dictionary aDict;
                 if ( pSection->GetDictionary( aDict ) )
                 {
-                    Dictionary::const_iterator iter = aDict.find( rtl::OUString("_PID_HLINKS") );
+                    Dictionary::const_iterator iter = aDict.find( OUString("_PID_HLINKS") );
 
                     if ( iter != aDict.end() )
                     {
@@ -413,13 +413,13 @@ sal_Bool ImplSdPPTImport::Import()
                                         {
                                             sal_uInt32 nPageNumber = 0;
                                             OUString aString( pHyperlink->aSubAdress );
-                                            rtl::OString aStringAry[ 3 ];
+                                            OString aStringAry[ 3 ];
                                             sal_uInt16 nTokenCount = comphelper::string::getTokenCount(aString, ',');
                                             if ( nTokenCount > 3 )
                                                 nTokenCount = 3;
                                             sal_uInt16 nToken;
                                             for( nToken = 0; nToken < nTokenCount; nToken++ )
-                                                aStringAry[nToken] = rtl::OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8);
+                                                aStringAry[nToken] = OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8);
 
                                             sal_Bool bSucceeded = sal_False;
 
@@ -1251,7 +1251,7 @@ sal_Bool ImplSdPPTImport::Import()
                 DffRecordHeader aContent;
                 if ( SeekToRec( rStCtrl, PPT_PST_CString, aCuHeader.GetRecEndFilePos(), &aContent ) )
                 {
-                    rtl::OUString aCuShow;
+                    OUString aCuShow;
                     aContent.SeekToBegOfRecord( rStCtrl );
                     if ( ReadString( aCuShow ) )
                     {
@@ -1368,7 +1368,7 @@ sal_Bool ImplSdPPTImport::Import()
     uno::Reference<document::XDocumentProperties> xDocProps
         = xDPS->getDocumentProperties();
     sfx2::LoadOlePropertySet(xDocProps, &mrStorage);
-    xDocProps->setTemplateName(::rtl::OUString());
+    xDocProps->setTemplateName(OUString());
 
     pSdrModel->setLock(false);
     pSdrModel->EnableUndo(true);
@@ -1853,7 +1853,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
 
 String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
 {
-    rtl::OUString aRetval;
+    OUString aRetval;
     sal_uInt32 nPosMerk = rStCtrl.Tell();
     DffRecordHeader aDocHd;
     if ( SeekToDocument( &aDocHd ) )
@@ -1870,7 +1870,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
             while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) )
             {
                 sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos();
-                rtl::OUString aRefStr;
+                OUString aRefStr;
                 sal_uInt32 nPosMerk2 = rStCtrl.Tell();
                 if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) )
                 {
@@ -1962,7 +1962,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
 
 String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const
 {
-    rtl::OUString aRetVal;
+    OUString aRetVal;
     DffRecordHeader* pHd( const_cast<ImplSdPPTImport*>(this)->aDocRecManager.GetRecordHeader( PPT_PST_ExObjList, SEEK_FROM_BEGINNING ) );
     if ( pHd )
     {
@@ -1996,7 +1996,7 @@ String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const
                                         case PPT_PST_CString :
                                         {
                                             aHd.SeekToBegOfRecord( rStCtrl );
-                                            rtl::OUString aStr;
+                                            OUString aStr;
                                             if ( ReadString( aStr ) )
                                             {
                                                 if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aStr, aRetVal ) )
@@ -2605,7 +2605,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                         case PPT_PST_InteractiveInfo:
                         {
                             sal_uInt32 nFilePosMerk2 = rSt.Tell();
-                            rtl::OUString aMacroName;
+                            OUString aMacroName;
 
                             if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) )
                                 ReadString(aMacroName);
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 192169da1fd5..8b5a2f251856 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -66,8 +66,6 @@
 #include <algorithm>
 
 using ::std::map;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
@@ -236,10 +234,10 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
 
 #ifdef DBG_ANIM_LOG
     static int ppt_anim_debug_stream_number = 1;
-    rtl::OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-");
-    ppt_anim_debug_filename += rtl::OUString::valueOf(ppt_anim_debug_stream_number++);
-    ppt_anim_debug_filename += rtl::OUString(".xml");
-    mpFile = fopen( rtl::OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" );
+    OUString ppt_anim_debug_filename("ppt-animation-import-debug-output-");
+    ppt_anim_debug_filename += OUString::valueOf(ppt_anim_debug_stream_number++);
+    ppt_anim_debug_filename += OUString(".xml");
+    mpFile = fopen( OUStringToOString( ppt_anim_debug_filename, RTL_TEXTENCODING_UTF8).getStr() , "w+" );
 #endif
     dump("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 
@@ -1310,7 +1308,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
     // TODO: DFF_ANIM_ID
     if( rSet.hasProperty( DFF_ANIM_ID ) )
     {
-        rtl::OUString aString;
+        OUString aString;
         rSet.getProperty( DFF_ANIM_ID ) >>= aString;
         //if( !aString.isEmpty() )
         //{
@@ -1320,7 +1318,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
     // TODO: DFF_ANIM_EVENT_FILTER
     if( rSet.hasProperty( DFF_ANIM_EVENT_FILTER ) )
     {
-        rtl::OUString aString;
+        OUString aString;
         rSet.getProperty( DFF_ANIM_EVENT_FILTER ) >>= aString;
         //if( !aString.isEmpty() )
         //{
@@ -1333,7 +1331,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
         Reference< XAnimate > xAnim( xNode, UNO_QUERY );
         if( xAnim.is() )
         {
-            rtl::OUString aString;
+            OUString aString;
             rSet.getProperty( DFF_ANIM_TIMEFILTER ) >>= aString;
             if( !aString.isEmpty() )
             {
@@ -1624,7 +1622,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R
                     Any aAny;
                     if ( importAttributeValue( pChildAtom, aAny ) )
                     {
-                        rtl::OUString filter;
+                        OUString filter;
                         aAny >>= filter;
 
                         dump( " filter=\"%s\"", filter );
@@ -2132,7 +2130,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R
                 Any aPath;
                 if ( importAttributeValue( pChildAtom, aPath ) )
                 {
-                    rtl::OUString aStr;
+                    OUString aStr;
                     if ( aPath >>= aStr )
                     {
                         aStr = aStr.replace( 'E', ' ' );
@@ -2754,7 +2752,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
 
             if( aValues[i] >>= aStr )
                 dump( "%s",
-                      ::rtl::OUStringToOString( aStr,
+                      OUStringToOString( aStr,
                                                 RTL_TEXTENCODING_ASCII_US ).getStr() );
             else if( aValues[i] >>= nVal )
                 dump( "%f", nVal );
@@ -2766,7 +2764,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
                 {
                     if( aValuePair.First >>= aStr )
                         dump( "%s",
-                              ::rtl::OUStringToOString( aStr,
+                              OUStringToOString( aStr,
                                                         RTL_TEXTENCODING_ASCII_US ).getStr() );
                     else if( aValuePair.First >>= nVal )
                         dump( "%f", nVal );
@@ -2775,7 +2773,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
 
                     if( aValuePair.Second >>= aStr )
                         dump( ",%s",
-                              ::rtl::OUStringToOString( aStr,
+                              OUStringToOString( aStr,
                                                         RTL_TEXTENCODING_ASCII_US ).getStr() );
                     else if( aValuePair.Second >>= nVal )
                         dump( ",%f", nVal );
@@ -2853,7 +2851,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny )
                 {
                     if ( ( nRecLen & 1 ) && ( nRecLen > 1 ) )
                     {
-                        rtl::OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, sal_True );
+                        OUString aOUString = mpPPTImport->MSDFFReadZString( mrStCtrl, nRecLen - 1, sal_True );
                         rAny <<= aOUString;
 
                         bOk = true;
@@ -3282,7 +3280,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine )
                     if( importAttributeValue( pChildAtom, aValue ) )
                     {
                         sal_Int32 nInt;
-                        rtl::OUString aString;
+                        OUString aString;
                         double fDouble;
 
                         if( aValue >>= nInt )
@@ -3292,7 +3290,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine )
                         else if( aValue >>= aString )
                         {
                             fprintf(mpFile, " value=\"%s\"",
-                                rtl::OUStringToOString(aString,
+                                OUStringToOString(aString,
                                     RTL_TEXTENCODING_UTF8).getStr());
                         }
                         else if( aValue >>= fDouble )
@@ -3443,7 +3441,7 @@ void AnimationImporter::dump( Any& rAny )
     }
     else if( rAny >>= aString )
     {
-        fprintf( mpFile, "%s", rtl::OUStringToOString(aString,
+        fprintf( mpFile, "%s", OUStringToOString(aString,
             RTL_TEXTENCODING_UTF8).getStr() );
     }
     else if( rAny >>= nInt )
@@ -3655,11 +3653,11 @@ void AnimationImporter::dump( const PropertySet& rSet )
 
         case DFF_ANIM_ID:
         {
-            rtl::OUString aString;
+            OUString aString;
             if( aAny >>= aString )
             {
                 fprintf( mpFile, " id=\"%s\"",
-                    rtl::OUStringToOString(aString,
+                    OUStringToOString(aString,
                         RTL_TEXTENCODING_UTF8).getStr() );
                 bKnown = true;
             }
@@ -3668,11 +3666,11 @@ void AnimationImporter::dump( const PropertySet& rSet )
 
         case DFF_ANIM_EVENT_FILTER:
         {
-            rtl::OUString aString;
+            OUString aString;
             if( aAny >>= aString )
             {
                 fprintf( mpFile, " eventFilter=\"%s\"",
-                    rtl::OUStringToOString(aString,
+                    OUStringToOString(aString,
                         RTL_TEXTENCODING_UTF8).getStr() );
                 bKnown = true;
             }
@@ -3691,11 +3689,11 @@ void AnimationImporter::dump( const PropertySet& rSet )
 
         case DFF_ANIM_TIMEFILTER:
         {
-            rtl::OUString aString;
+            OUString aString;
             if( aAny >>= aString )
             {
                 fprintf( mpFile, " timeFilter=\"%s\"",
-                    rtl::OUStringToOString(aString,
+                    OUStringToOString(aString,
                         RTL_TEXTENCODING_UTF8).getStr() );
                 bKnown = true;
             }
@@ -3704,11 +3702,11 @@ void AnimationImporter::dump( const PropertySet& rSet )
 
         case DFF_ANIM_RUNTIMECONTEXT:
         {
-            rtl::OUString aString;
+            OUString aString;
             if( aAny >>= aString )
             {
                 fprintf( mpFile, " runtimeContext=\"%s\"",
-                    rtl::OUStringToOString(aString,
+                    OUStringToOString(aString,
                         RTL_TEXTENCODING_UTF8).getStr() );
                 bKnown = true;
             }
@@ -3786,9 +3784,9 @@ void AnimationImporter::dump( const char * pText )
     fprintf( mpFile, "%s", pText );
 }
 
-void AnimationImporter::dump( const rtl::OUString& rString )
+void AnimationImporter::dump( const OUString& rString )
 {
-    fprintf( mpFile, rtl::OUStringToOString(rString,
+    fprintf( mpFile, OUStringToOString(rString,
         RTL_TEXTENCODING_UTF8).getStr() );
 }
 
@@ -3814,7 +3812,7 @@ void AnimationImporter::dump( const char * pText, const char * pText2 )
 
 void AnimationImporter::dump( const char * pText, const OUString& rString )
 {
-    fprintf( mpFile, pText, rtl::OUStringToOString(rString,
+    fprintf( mpFile, pText, OUStringToOString(rString,
         RTL_TEXTENCODING_UTF8).getStr() );
 }
 
@@ -3860,7 +3858,7 @@ void AnimationImporter::dump( const char * , const char *  )
 {
 }
 
-void AnimationImporter::dump( const char * , const rtl::OUString&  )
+void AnimationImporter::dump( const char * , const OUString&  )
 {
 }
 
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index 6f39990ed935..691e41872cdf 100644
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -72,7 +72,7 @@ private:
     void importAnimateKeyPoints( const Atom* pAtom, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode );
     void importPropertySetContainer( const Atom* pAtom,PropertySet& rSet );
     bool importAttributeValue( const Atom* pAtom, com::sun::star::uno::Any& rAny );
-    bool importAttributeNamesContainer( const Atom* pAtom, rtl::OUString& rAttributeNames );
+    bool importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames );
     sal_Int32 importTargetElementContainer( const Atom* pAtom, ::com::sun::star::uno::Any& rTarget, sal_Int16& nSubType );
 
     void fillNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet );
@@ -100,7 +100,7 @@ private:
 #ifdef DBG_ANIM_LOG
     FILE * mpFile;
     void dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen );
-    void dump( const rtl::OUString& rString );
+    void dump( const OUString& rString );
     void dump( sal_uInt32 nLen, bool bNewLine = true );
 #endif
 
@@ -115,7 +115,7 @@ private:
     void dump( const char * pText, sal_Int64 nInt );
     void dump( const char * pText, double fDouble );
     void dump( const char * pText, const char * pText2 );
-    void dump( const char * pText, const rtl::OUString& rString );
+    void dump( const char * pText, const OUString& rString );
 };
 
 } // namespace ppt