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

10 files changed, 85 insertions, 86 deletions

diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 2b08c0ff7085..3fb077043733 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -30,7 +30,7 @@ using namespace ::rtl;
 SvXMLAutoCorrectExport::SvXMLAutoCorrectExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
     const SvxAutocorrWordList *  pNewAutocorr_List,
-    const rtl::OUString &rFileName,
+    const OUString &rFileName,
     com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler)
 :   SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ),
     pAutocorr_List( pNewAutocorr_List )
@@ -74,7 +74,7 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum XMLTokenEnum /*eClass*/)
 SvXMLExceptionListExport::SvXMLExceptionListExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
     const SvStringsISortDtor &rNewList,
-    const rtl::OUString &rFileName,
+    const OUString &rFileName,
     com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler)
 :   SvXMLExport( xContext, rFileName, util::MeasureUnit::CM, rHandler ),
     rList( rNewList )
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index 430aca271c4e..3658779fa24e 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -33,7 +33,7 @@ public:
     SvXMLAutoCorrectExport(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
         const SvxAutocorrWordList * pNewAutocorr_List,
-        const rtl::OUString &rFileName,
+        const OUString &rFileName,
         com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
 
     virtual ~SvXMLAutoCorrectExport ( void ) {}
@@ -53,7 +53,7 @@ public:
     SvXMLExceptionListExport(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
         const SvStringsISortDtor &rNewList,
-        const rtl::OUString &rFileName,
+        const OUString &rFileName,
         com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler> &rHandler);
 
     virtual ~SvXMLExceptionListExport ( void ) {}
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 5d8fc09fea3d..9b4de022c622 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -38,7 +38,7 @@ SvXMLAutoCorrectImport::SvXMLAutoCorrectImport(
     xStorage ( rNewStorage )
 {
     GetNamespaceMap().Add(
-            rtl::OUString(aBlockList),
+            OUString(aBlockList),
             GetXMLToken ( XML_N_BLOCK_LIST),
             XML_NAMESPACE_BLOCKLIST );
 }
@@ -149,7 +149,7 @@ SvXMLExceptionListImport::SvXMLExceptionListImport(
     rList (rNewList)
 {
     GetNamespaceMap().Add(
-            rtl::OUString(aBlockList),
+            OUString(aBlockList),
             GetXMLToken ( XML_N_BLOCK_LIST),
             XML_NAMESPACE_BLOCKLIST );
 }
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 106ea4023c29..78b2e5571662 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -33,7 +33,7 @@ protected:
     // This method is called after the namespace map has been updated, but
     // before a context for the current element has been pushed.
     virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
-                  const ::rtl::OUString& rLocalName,
+                  const OUString& rLocalName,
                   const ::com::sun::star::uno::Reference<
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
 public:
@@ -57,11 +57,11 @@ private:
 public:
     SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport,
                            sal_uInt16 nPrefix,
-                           const rtl::OUString& rLocalName,
+                           const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
                            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
-                           const rtl::OUString& rLocalName,
+                           const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
                            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     ~SvXMLWordListContext ( void );
@@ -74,7 +74,7 @@ private:
 public:
     SvXMLWordContext ( SvXMLAutoCorrectImport& rImport,
                            sal_uInt16 nPrefix,
-                           const rtl::OUString& rLocalName,
+                           const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
                            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     ~SvXMLWordContext ( void );
@@ -88,7 +88,7 @@ protected:
     // This method is called after the namespace map has been updated, but
     // before a context for the current element has been pushed.
     virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
-                  const ::rtl::OUString& rLocalName,
+                  const OUString& rLocalName,
                   const ::com::sun::star::uno::Reference<
                     ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
 public:
@@ -108,11 +108,11 @@ private:
 public:
     SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport,
                            sal_uInt16 nPrefix,
-                           const rtl::OUString& rLocalName,
+                           const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
                            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
-                           const rtl::OUString& rLocalName,
+                           const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
                            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     ~SvXMLExceptionListContext ( void );
@@ -125,7 +125,7 @@ private:
 public:
     SvXMLExceptionContext ( SvXMLExceptionListImport& rImport,
                            sal_uInt16 nPrefix,
-                           const rtl::OUString& rLocalName,
+                           const OUString& rLocalName,
                            const ::com::sun::star::uno::Reference<
                            ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
     ~SvXMLExceptionContext ( void );
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 7156590a3f7d..04a9bdf5ffa2 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -33,7 +33,6 @@
 using namespace utl;
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 SvxAutoCorrCfg::SvxAutoCorrCfg() :
     aBaseConfig(*this),
@@ -53,7 +52,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
     {
         *pS = sAutoPath.GetToken( n, ';' );
         INetURLObject aPath( *pS );
-        aPath.insertName(rtl::OUString("acor"));
+        aPath.insertName(OUString("acor"));
         *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI);
     }
     pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath );
@@ -217,7 +216,7 @@ void SvxBaseAutoCorrCfg::Load(sal_Bool bInit)
 }
 
 SvxBaseAutoCorrCfg::SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rPar) :
-    utl::ConfigItem(rtl::OUString("Office.Common/AutoCorrect")),
+    utl::ConfigItem(OUString("Office.Common/AutoCorrect")),
     rParent(rPar)
 {
 }
@@ -526,7 +525,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
 }
 
 SvxSwAutoCorrCfg::SvxSwAutoCorrCfg(SvxAutoCorrCfg& rPar) :
-    utl::ConfigItem(rtl::OUString("Office.Writer/AutoFunction")),
+    utl::ConfigItem(OUString("Office.Writer/AutoFunction")),
     rParent(rPar)
 {
 }
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 2d1e5f2963f1..860a673e1635 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -58,8 +58,8 @@ namespace editeng
     class HangulHanjaConversion_Impl
     {
     private:
-        typedef ::std::set< ::rtl::OUString, ::std::less< ::rtl::OUString > >                   StringBag;
-        typedef ::std::map< ::rtl::OUString, ::rtl::OUString, ::std::less< ::rtl::OUString > >  StringMap;
+        typedef ::std::set< OUString, ::std::less< OUString > >                   StringBag;
+        typedef ::std::map< OUString, OUString, ::std::less< OUString > >  StringMap;
 
     private:
         StringBag               m_sIgnoreList;
@@ -104,14 +104,14 @@ namespace editeng
         bool                    m_bAutoReplaceUnique;
 
         // state
-        ::rtl::OUString                m_sCurrentPortion;      // the text which we are currently working on
+        OUString                m_sCurrentPortion;      // the text which we are currently working on
         LanguageType            m_nCurrentPortionLang;  // language of m_sCurrentPortion found
         sal_Int32               m_nCurrentStartIndex;   // the start index within m_sCurrentPortion of the current convertible portion
         sal_Int32               m_nCurrentEndIndex;     // the end index (excluding) within m_sCurrentPortion of the current convertible portion
         sal_Int32               m_nReplacementBaseIndex;// index which ReplaceUnit-calls need to be relative to
         sal_Int32               m_nCurrentConversionOption;
         sal_Int16               m_nCurrentConversionType;
-        Sequence< ::rtl::OUString >
+        Sequence< OUString >
                                 m_aCurrentSuggestions;  // the suggestions for the current unit
                                                         // (means for the text [m_nCurrentStartIndex, m_nCurrentEndIndex) in m_sCurrentPortion)
         sal_Bool                m_bTryBothDirections;   // specifies if other conversion directions should be tried when looking for convertible characters
@@ -175,7 +175,7 @@ namespace editeng
         void    implProceed( bool _bRepeatCurrentUnit );
 
         // change the current convertible, and do _not_ proceed
-        void    implChange( const ::rtl::OUString& _rChangeInto );
+        void    implChange( const OUString& _rChangeInto );
 
         /** find the next convertible piece of text, with possibly advancing to the next portion
 
@@ -218,7 +218,7 @@ namespace editeng
 
         /** get the string currently considered to be replaced or ignored
         */
-        ::rtl::OUString GetCurrentUnit() const;
+        OUString GetCurrentUnit() const;
 
         /** read options from configuration, update suggestion list and dialog content
         */
@@ -412,13 +412,13 @@ namespace editeng
             //put recently used string to front:
             if( m_bShowRecentlyUsedFirst && m_aCurrentSuggestions.getLength()>1 )
             {
-                ::rtl::OUString sCurrentUnit( GetCurrentUnit() );
+                OUString sCurrentUnit( GetCurrentUnit() );
                 StringMap::const_iterator aRecentlyUsed = m_aRecentlyUsedList.find( sCurrentUnit );
                 bool bUsedBefore = aRecentlyUsed != m_aRecentlyUsedList.end();
                 if( bUsedBefore && m_aCurrentSuggestions[0] != aRecentlyUsed->second )
                 {
                     sal_Int32 nCount = m_aCurrentSuggestions.getLength();
-                    Sequence< ::rtl::OUString > aTmp(nCount);
+                    Sequence< OUString > aTmp(nCount);
                     aTmp[0]=aRecentlyUsed->second;
                     sal_Int32 nDiff = 1;
                     for( sal_Int32 n=1; n<nCount; n++)//we had 0 already
@@ -475,7 +475,7 @@ namespace editeng
     {
         sal_Bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional;
 
-        m_sCurrentPortion = ::rtl::OUString();
+        m_sCurrentPortion = OUString();
         m_nCurrentPortionLang = LANGUAGE_NONE;
         m_pAntiImpl->GetNextPortion( m_sCurrentPortion, m_nCurrentPortionLang, bAllowImplicitChanges );
         m_nReplacementBaseIndex = 0;
@@ -519,7 +519,7 @@ namespace editeng
         return sal_False;
     }
 
-    ::rtl::OUString HangulHanjaConversion_Impl::GetCurrentUnit() const
+    OUString HangulHanjaConversion_Impl::GetCurrentUnit() const
     {
         DBG_ASSERT( m_nCurrentStartIndex < m_sCurrentPortion.getLength(),
             "HangulHanjaConversion_Impl::GetCurrentUnit: invalid index into current portion!" );
@@ -528,7 +528,7 @@ namespace editeng
         DBG_ASSERT( m_nCurrentStartIndex <= m_nCurrentEndIndex,
             "HangulHanjaConversion_Impl::GetCurrentUnit: invalid interval!" );
 
-        ::rtl::OUString sCurrentUnit = m_sCurrentPortion.copy( m_nCurrentStartIndex, m_nCurrentEndIndex - m_nCurrentStartIndex );
+        OUString sCurrentUnit = m_sCurrentPortion.copy( m_nCurrentStartIndex, m_nCurrentEndIndex - m_nCurrentStartIndex );
         return sCurrentUnit;
     }
 
@@ -539,7 +539,7 @@ namespace editeng
 
         while ( !bDocumentDone && !bNeedUserInteraction && implNextConvertible( _bRepeatCurrentUnit ) )
         {
-            ::rtl::OUString sCurrentUnit( GetCurrentUnit() );
+            OUString sCurrentUnit( GetCurrentUnit() );
 
             // do we need to ignore it?
             sal_Bool bAlwaysIgnoreThis = m_sIgnoreList.end() != m_sIgnoreList.find( sCurrentUnit );
@@ -704,7 +704,7 @@ namespace editeng
         }
     }
 
-    void HangulHanjaConversion_Impl::implChange( const ::rtl::OUString& _rChangeInto )
+    void HangulHanjaConversion_Impl::implChange( const OUString& _rChangeInto )
     {
         if( _rChangeInto.isEmpty() )
             return;
@@ -811,7 +811,7 @@ namespace editeng
 
         if(m_pConversionDialog)
         {
-            ::rtl::OUString sCurrentUnit( GetCurrentUnit() );
+            OUString sCurrentUnit( GetCurrentUnit() );
 
             m_pConversionDialog->SetCurrentString( sCurrentUnit, m_aCurrentSuggestions );
             m_pConversionDialog->FocusSuggestion();
@@ -873,8 +873,8 @@ namespace editeng
         DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" );
         if ( m_pConversionDialog )
         {
-            ::rtl::OUString sCurrentUnit( m_pConversionDialog->GetCurrentString() );
-            ::rtl::OUString sChangeInto( m_pConversionDialog->GetCurrentSuggestion( ) );
+            OUString sCurrentUnit( m_pConversionDialog->GetCurrentString() );
+            OUString sChangeInto( m_pConversionDialog->GetCurrentSuggestion( ) );
 
             if( !sChangeInto.isEmpty() )
             {
@@ -916,8 +916,8 @@ namespace editeng
         {
             try
             {
-                ::rtl::OUString sNewOriginal( m_pConversionDialog->GetCurrentSuggestion( ) );
-                Sequence< ::rtl::OUString > aSuggestions;
+                OUString sNewOriginal( m_pConversionDialog->GetCurrentSuggestion( ) );
+                Sequence< OUString > aSuggestions;
 
                 DBG_ASSERT( m_xConverter.is(), "HangulHanjaConversion_Impl::OnFind: no converter!" );
                 TextConversionResult aToHanja = m_xConverter->getConversions(
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index aefd764892cc..6b810985e264 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -163,7 +163,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
     Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
     sal_Bool bWrapReverse = xProp.is() ?
         *(sal_Bool*)xProp->getPropertyValue(
-            ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue()
+            OUString(UPN_IS_WRAP_REVERSE) ).getValue()
         : sal_False;
     bReverse = bRevAllow && bWrapReverse;
     bStartDone = bOther || ( !bReverse && bStart );
@@ -402,7 +402,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
     Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
     sal_Bool bWrapReverse = xProp.is() ?
             *(sal_Bool*)xProp->getPropertyValue(
-                ::rtl::OUString(UPN_IS_WRAP_REVERSE) ).getValue()
+                OUString(UPN_IS_WRAP_REVERSE) ).getValue()
             : sal_False;
     sal_Bool bActRev = bRevAllowed && bWrapReverse;
 
@@ -449,7 +449,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
     {
         sal_Bool bIsSpellSpecial = xProp.is() ?
             *(sal_Bool*)xProp->getPropertyValue(
-                ::rtl::OUString(UPN_IS_SPELL_SPECIAL) ).getValue()
+                OUString(UPN_IS_SPELL_SPECIAL) ).getValue()
             : sal_False;
         // Body area done, ask for special area
         if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
@@ -561,7 +561,7 @@ sal_Bool SvxSpellWrapper::FindSpellError()
         {
             if (IsAllRight() && xAllRightDic.is())
             {
-                xAllRightDic->add( xAlt->getWord(), sal_False, ::rtl::OUString() );
+                xAllRightDic->add( xAlt->getWord(), sal_False, OUString() );
             }
             else
             {
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index fe5981eb5153..96f5b8602470 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -421,7 +421,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
                     }
                 }
                 sal_Unicode cSave = rTxt.GetChar( nSttPos );
-                rtl::OUString sChar( cSave );
+                OUString sChar( cSave );
                 sChar = rCC.lowercase( sChar );
                 if( sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ))
                 {
@@ -482,7 +482,7 @@ sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
         uno::Reference< i18n::XOrdinalSuffix > xOrdSuffix
                 = i18n::OrdinalSuffix::create( comphelper::getProcessComponentContext() );
 
-        uno::Sequence< rtl::OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix( nNum, rCC.getLanguageTag().getLocale( ) );
+        uno::Sequence< OUString > aSuffixes = xOrdSuffix->getOrdinalSuffix( nNum, rCC.getLanguageTag().getLocale( ) );
         for ( sal_Int32 nSuff = 0; nSuff < aSuffixes.getLength(); nSuff++ )
         {
             String sSuffix( aSuffixes[ nSuff ] );
@@ -534,17 +534,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
                     ;
 
                 // found: " --[<AnySttChars>][A-z0-9]
-                if( rCC.isLetterNumeric( rtl::OUString(cCh) ) )
+                if( rCC.isLetterNumeric( OUString(cCh) ) )
                 {
                     for( n = nSttPos-1; n && lcl_IsInAsciiArr(
                             sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); )
                         ;
 
                     // found: "[A-z0-9][<AnyEndChars>] --[<AnySttChars>][A-z0-9]
-                    if( rCC.isLetterNumeric( rtl::OUString(cCh) ))
+                    if( rCC.isLetterNumeric( OUString(cCh) ))
                     {
                         rDoc.Delete( nSttPos, nSttPos + 2 );
-                        rDoc.Insert( nSttPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) );
+                        rDoc.Insert( nSttPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) );
                         bRet = sal_True;
                     }
                 }
@@ -569,17 +569,17 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
                     ;
 
                 // found: " - [<AnySttChars>][A-z0-9]
-                if( rCC.isLetterNumeric( rtl::OUString(cCh) ) )
+                if( rCC.isLetterNumeric( OUString(cCh) ) )
                 {
                     cCh = ' ';
                     for( n = nTmpPos-1; n && lcl_IsInAsciiArr(
                             sImplEndSkipChars,(cCh = rTxt.GetChar( --n ))); )
                             ;
                     // found: "[A-z0-9][<AnyEndChars>] - [<AnySttChars>][A-z0-9]
-                    if( rCC.isLetterNumeric( rtl::OUString(cCh) ))
+                    if( rCC.isLetterNumeric( OUString(cCh) ))
                     {
                         rDoc.Delete( nTmpPos, nTmpPos + nLen );
-                        rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? rtl::OUString(cEmDash) : rtl::OUString(cEnDash) );
+                        rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) );
                         bRet = sal_True;
                     }
                 }
@@ -603,7 +603,7 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
         {
             nSttPos = nSttPos + nFndPos;
             rDoc.Delete( nSttPos, nSttPos + 2 );
-            rDoc.Insert( nSttPos, (bEnDash ? rtl::OUString(cEnDash) : rtl::OUString(cEmDash)) );
+            rDoc.Insert( nSttPos, (bEnDash ? OUString(cEnDash) : OUString(cEmDash)) );
             bRet = sal_True;
         }
     }
@@ -650,7 +650,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
 
 
             // Check the presence of "://" in the word
-            xub_StrLen nStrPos = rTxt.Search( rtl::OUString( "://" ), nSttWdPos + 1 );
+            xub_StrLen nStrPos = rTxt.Search( OUString( "://" ), nSttWdPos + 1 );
             if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 )
             {
                 // Check the previous char
@@ -672,7 +672,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
 
                     // Add the non-breaking space at the end pos
                     if ( bHasSpace )
-                        rDoc.Insert( nPos, rtl::OUString(CHAR_HARDBLANK) );
+                        rDoc.Insert( nPos, OUString(CHAR_HARDBLANK) );
                     bRunNext = true;
                     bRet = true;
                 }
@@ -868,7 +868,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         if( !pPrevPara )
         {
             // valid separator -> replace
-            rtl::OUString sChar( *pWordStt );
+            OUString sChar( *pWordStt );
             sChar = rCC.titlecase(sChar); //see fdo#56740
             return  !comphelper::string::equals(sChar, *pWordStt) &&
                     rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar );
@@ -1013,7 +1013,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     // check on the basis of the exception list
     if( pExceptStt )
     {
-        sWord = rtl::OUString(pStr, pExceptStt - pStr + 1);
+        sWord = OUString(pStr, pExceptStt - pStr + 1);
         if( FindInCplSttExceptList(eLang, sWord) )
             return sal_False;
 
@@ -1043,7 +1043,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     // Ok, then replace
     sal_Unicode cSave = *pWordStt;
     nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() );
-    rtl::OUString sChar( cSave );
+    OUString sChar( cSave );
     sChar = rCC.titlecase(sChar); //see fdo#56740
     sal_Bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
 
@@ -1072,8 +1072,8 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
         return false;
 
     String aConverted;
-    aConverted.Append( rCC.uppercase(rtl::OUString(rTxt.GetChar(nSttPos))) );
-    aConverted.Append( rCC.lowercase(rtl::OUString(rTxt.GetChar(nSttPos+1))) );
+    aConverted.Append( rCC.uppercase(OUString(rTxt.GetChar(nSttPos))) );
+    aConverted.Append( rCC.lowercase(OUString(rTxt.GetChar(nSttPos+1))) );
 
     for (xub_StrLen i = nSttPos+2; i < nEndPos; ++i)
     {
@@ -1083,7 +1083,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
 
         if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) )
             // Another uppercase letter.  Convert it.
-            aConverted.Append(rCC.lowercase(rtl::OUString(rTxt.GetChar(i))));
+            aConverted.Append(rCC.lowercase(OUString(rTxt.GetChar(i))));
         else
             // This is not an alphabetic letter.  Leave it as-is.
             aConverted.Append(rTxt.GetChar(i));
@@ -1134,13 +1134,13 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
     LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
     sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
 
-    rtl::OUString sChg( cInsChar );
+    OUString sChg( cInsChar );
     if( bIns )
         rDoc.Insert( nInsPos, sChg );
     else
         rDoc.Replace( nInsPos, sChg );
 
-    sChg = rtl::OUString(cRet);
+    sChg = OUString(cRet);
 
     if( '\"' == cInsChar )
     {
@@ -1154,7 +1154,7 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
         case LANGUAGE_FRENCH_SWISS:
         case LANGUAGE_FRENCH_LUXEMBOURG:
             {
-                rtl::OUString s( static_cast< sal_Unicode >(0xA0) );
+                OUString s( static_cast< sal_Unicode >(0xA0) );
                     // UNICODE code for no break space
                 if( rDoc.Insert( bSttQuote ? nInsPos+1 : nInsPos, s ))
                 {
@@ -1175,7 +1175,7 @@ String SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, xub_StrLen nInsPos,
     LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
     sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
 
-    String sRet = rtl::OUString(cRet);
+    String sRet = OUString(cRet);
 
     if( '\"' == cInsChar )
     {
@@ -1237,9 +1237,9 @@ sal_uLong SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
             }
 
             if( bInsert )
-                rDoc.Insert( nInsPos, rtl::OUString(cChar) );
+                rDoc.Insert( nInsPos, OUString(cChar) );
             else
-                rDoc.Replace( nInsPos, rtl::OUString(cChar) );
+                rDoc.Replace( nInsPos, OUString(cChar) );
 
             // Hardspaces autocorrection
             if ( IsAutoCorrFlag( AddNonBrkSpace ) )
@@ -1695,8 +1695,8 @@ static void GeneratePackageName ( const String& rShort, String& rPackageName )
     rPackageName = rShort;
     xub_StrLen nPos = 0;
     sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 };
-    rtl::OString sByte(rtl::OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7));
-    rPackageName = rtl::OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US);
+    OString sByte(OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7));
+    rPackageName = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US);
     while( STRING_NOTFOUND != ( nPos = rPackageName.SearchChar( pDelims, nPos )))
     {
         rPackageName.SetChar( nPos, '_' );
@@ -1825,7 +1825,7 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
 
 static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
 {
-    String sAbk(rtl::OUString('~'));
+    String sAbk(OUString('~'));
     SvStringsISortDtor::const_iterator it = pList->find( &sAbk );
     sal_uInt16 nPos = it - pList->begin();
     if( nPos < pList->size() )
@@ -2071,7 +2071,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp(
                 OUString aMime( "text/xml" );
                 uno::Any aAny;
                 aAny <<= aMime;
-                xStrm->SetProperty( rtl::OUString("MediaType"), aAny );
+                xStrm->SetProperty( OUString("MediaType"), aAny );
 
 
                 uno::Reference< uno::XComponentContext > xContext =
@@ -2330,7 +2330,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
         aDest = INetURLObject ( sUserAutoCorrFile );
         if ( SotStorage::IsOLEStorage ( sShareAutoCorrFile ) )
         {
-            aDest.SetExtension ( rtl::OUString("bak") );
+            aDest.SetExtension ( OUString("bak") );
             bConvert = sal_True;
         }
         bCopy = sal_True;
@@ -2339,7 +2339,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl()
     {
         aSource = INetURLObject ( sUserAutoCorrFile );
         aDest = INetURLObject ( sUserAutoCorrFile );
-        aDest.SetExtension ( rtl::OUString("bak") );
+        aDest.SetExtension ( OUString("bak") );
         bCopy = bConvert = sal_True;
     }
     if (bCopy)
@@ -2426,7 +2426,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg )
         {
             refList->SetSize( 0 );
             refList->SetBufferSize( 8192 );
-            String aPropName( rtl::OUString( "MediaType" ) );
+            String aPropName( OUString( "MediaType" ) );
             OUString aMime( "text/xml" );
             uno::Any aAny;
             aAny <<= aMime;
@@ -2693,8 +2693,8 @@ bool SvxAutocorrWordList::Insert(SvxAutocorrWord *pWord)
 {
     if ( maSet.empty() ) // use the hash
     {
-        rtl::OUString aShort( pWord->GetShort() );
-        return maHash.insert( std::pair<rtl::OUString, SvxAutocorrWord *>( aShort, pWord ) ).second;
+        OUString aShort( pWord->GetShort() );
+        return maHash.insert( std::pair<OUString, SvxAutocorrWord *>( aShort, pWord ) ).second;
     }
     else
         return maSet.insert( pWord ).second;
@@ -2771,7 +2771,7 @@ bool SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *pFnd,
         {
             TransliterationWrapper& rCmp = GetIgnoreTranslWrapper();
 
-            rtl::OUString sWord(rTxt.GetBuffer() + nCalcStt, rChk.Len());
+            OUString sWord(rTxt.GetBuffer() + nCalcStt, rChk.Len());
             if( rCmp.isEqual( rChk, sWord ))
             {
                 rStt = nCalcStt;
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index d532f57f9026..d291179f5cac 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -24,7 +24,7 @@
 #include <editeng/swafopt.hxx>
 
 SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
-    : aBulletFont( rtl::OUString("StarSymbol"),
+    : aBulletFont( OUString("StarSymbol"),
                     Size( 0, 14 ) )
 {
     bAutoCorrect =
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 64f65dbe1e59..4a0c2490c2bd 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -103,7 +103,7 @@ public:
     virtual ::com::sun::star::uno::Sequence<
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::linguistic2::XMeaning > > SAL_CALL
-        queryMeanings( const ::rtl::OUString& rTerm,
+        queryMeanings( const OUString& rTerm,
                 const ::com::sun::star::lang::Locale& rLocale,
                 const ::com::sun::star::beans::PropertyValues& rProperties )
             throw(::com::sun::star::lang::IllegalArgumentException,
@@ -190,7 +190,7 @@ sal_Bool SAL_CALL
 
 uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
         ThesDummy_Impl::queryMeanings(
-                const rtl::OUString& rTerm,
+                const OUString& rTerm,
                 const lang::Locale& rLocale,
                 const beans::PropertyValues& rProperties )
             throw(lang::IllegalArgumentException,
@@ -227,13 +227,13 @@ public:
 
     // XSpellChecker1 (same as XSpellChecker but sal_Int16 for language)
     virtual sal_Bool SAL_CALL
-        isValid( const ::rtl::OUString& rWord, sal_Int16 nLanguage,
+        isValid( const OUString& rWord, sal_Int16 nLanguage,
                 const ::com::sun::star::beans::PropertyValues& rProperties )
             throw(::com::sun::star::lang::IllegalArgumentException,
                   ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL
-        spell( const ::rtl::OUString& rWord, sal_Int16 nLanguage,
+        spell( const OUString& rWord, sal_Int16 nLanguage,
                 const ::com::sun::star::beans::PropertyValues& rProperties )
             throw(::com::sun::star::lang::IllegalArgumentException,
                   ::com::sun::star::uno::RuntimeException);
@@ -275,7 +275,7 @@ sal_Bool SAL_CALL
 
 
 sal_Bool SAL_CALL
-    SpellDummy_Impl::isValid( const rtl::OUString& rWord, sal_Int16 nLanguage,
+    SpellDummy_Impl::isValid( const OUString& rWord, sal_Int16 nLanguage,
             const beans::PropertyValues& rProperties )
         throw(lang::IllegalArgumentException,
               uno::RuntimeException)
@@ -289,7 +289,7 @@ sal_Bool SAL_CALL
 
 
 uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
-    SpellDummy_Impl::spell( const rtl::OUString& rWord, sal_Int16 nLanguage,
+    SpellDummy_Impl::spell( const OUString& rWord, sal_Int16 nLanguage,
             const beans::PropertyValues& rProperties )
         throw(lang::IllegalArgumentException,
               uno::RuntimeException)
@@ -326,7 +326,7 @@ public:
     // XHyphenator
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
-        hyphenate( const ::rtl::OUString& rWord,
+        hyphenate( const OUString& rWord,
                 const ::com::sun::star::lang::Locale& rLocale,
                 sal_Int16 nMaxLeading,
                 const ::com::sun::star::beans::PropertyValues& rProperties )
@@ -334,7 +334,7 @@ public:
                   ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL
-        queryAlternativeSpelling( const ::rtl::OUString& rWord,
+        queryAlternativeSpelling( const OUString& rWord,
                 const ::com::sun::star::lang::Locale& rLocale,
                 sal_Int16 nIndex,
                 const ::com::sun::star::beans::PropertyValues& rProperties )
@@ -343,7 +343,7 @@ public:
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL
         createPossibleHyphens(
-                const ::rtl::OUString& rWord,
+                const OUString& rWord,
                 const ::com::sun::star::lang::Locale& rLocale,
                 const ::com::sun::star::beans::PropertyValues& rProperties )
             throw(::com::sun::star::lang::IllegalArgumentException,
@@ -387,7 +387,7 @@ sal_Bool SAL_CALL
 
 uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
     HyphDummy_Impl::hyphenate(
-            const rtl::OUString& rWord,
+            const OUString& rWord,
             const lang::Locale& rLocale,
             sal_Int16 nMaxLeading,
             const beans::PropertyValues& rProperties )
@@ -404,7 +404,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
 
 uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
     HyphDummy_Impl::queryAlternativeSpelling(
-            const rtl::OUString& rWord,
+            const OUString& rWord,
             const lang::Locale& rLocale,
             sal_Int16 nIndex,
             const PropertyValues& rProperties )
@@ -421,7 +421,7 @@ uno::Reference< linguistic2::XHyphenatedWord > SAL_CALL
 
 uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL
     HyphDummy_Impl::createPossibleHyphens(
-            const rtl::OUString& rWord,
+            const OUString& rWord,
             const lang::Locale& rLocale,
             const beans::PropertyValues& rProperties )
         throw(lang::IllegalArgumentException,