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
author: Luboš Luňák <l.lunak@suse.cz> 2013-04-07 12:06:47 +0200
committer: Luboš Luňák <l.lunak@suse.cz> 2013-04-07 14:23:11 +0200
commit: 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
tree: e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svtools/source/misc
parent: Typo in comment in resmgr.hxx (diff)
download: core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz
core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip
17 files changed, 251 insertions, 251 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index b167234f937d..b86d31aed27c 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -178,7 +178,7 @@ sal_Bool AcceleratorExecute::execute(const KeyCode& aVCLKey)
 //-----------------------------------------------
 sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
 {
-    ::rtl::OUString sCommand = impl_ts_findCommand(aAWTKey);
+    OUString sCommand = impl_ts_findCommand(aAWTKey);
 
     // No Command found? Do nothing! User isnt interested on any error handling .-)
     if (sCommand.isEmpty())
@@ -199,7 +199,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
     xParser->parseStrict(aURL);
 
     // ask for dispatch object
-    css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, ::rtl::OUString(), 0);
+    css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, OUString(), 0);
     sal_Bool bRet = xDispatch.is();
     if ( bRet )
     {
@@ -241,12 +241,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
 //-----------------------------------------------
-::rtl::OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey)
+OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey)
 {
     return impl_ts_findCommand(aKey);
 }
 //-----------------------------------------------
-::rtl::OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
+OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
 {
     // SAFE -> ----------------------------------
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -258,7 +258,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
     aLock.clear();
     // <- SAFE ----------------------------------
 
-    ::rtl::OUString sCommand;
+    OUString sCommand;
 
     try
     {
@@ -296,71 +296,71 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
         switch( aKey.KeyCode )
         {
         case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE:
-            return rtl::OUString( ".uno:DelToStartOfLine" );
+            return OUString( ".uno:DelToStartOfLine" );
         case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE:
-            return rtl::OUString( ".uno:DelToEndOfLine" );
+            return OUString( ".uno:DelToEndOfLine" );
         case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
-            return rtl::OUString( ".uno:DelToStartOfPara" );
+            return OUString( ".uno:DelToStartOfPara" );
         case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
-            return rtl::OUString( ".uno:DelToEndOfPara" );
+            return OUString( ".uno:DelToEndOfPara" );
         case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
-            return rtl::OUString( ".uno:DelToStartOfWord" );
+            return OUString( ".uno:DelToStartOfWord" );
         case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
-            return rtl::OUString( ".uno:DelToEndOfWord" );
+            return OUString( ".uno:DelToEndOfWord" );
         case com::sun::star::awt::Key::INSERT_LINEBREAK:
-            return rtl::OUString( ".uno:InsertLinebreak" );
+            return OUString( ".uno:InsertLinebreak" );
         case com::sun::star::awt::Key::INSERT_PARAGRAPH:
-            return rtl::OUString( ".uno:InsertPara" );
+            return OUString( ".uno:InsertPara" );
         case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
-            return rtl::OUString( ".uno:GoToPrevWord" );
+            return OUString( ".uno:GoToPrevWord" );
         case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
-            return rtl::OUString( ".uno:GoToNextWord" );
+            return OUString( ".uno:GoToNextWord" );
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
-            return rtl::OUString( ".uno:GoToStartOfLine" );
+            return OUString( ".uno:GoToStartOfLine" );
         case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
-            return rtl::OUString( ".uno:GoToEndOfLine" );
+            return OUString( ".uno:GoToEndOfLine" );
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
-            return rtl::OUString( ".uno:GoToStartOfPara" );
+            return OUString( ".uno:GoToStartOfPara" );
         case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
-            return rtl::OUString( ".uno:GoToEndOfPara" );
+            return OUString( ".uno:GoToEndOfPara" );
         case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
-            return rtl::OUString( ".uno:GoToStartOfDoc" );
+            return OUString( ".uno:GoToStartOfDoc" );
         case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT:
-            return rtl::OUString( ".uno:GoToEndOfDoc" );
+            return OUString( ".uno:GoToEndOfDoc" );
         case com::sun::star::awt::Key::SELECT_BACKWARD:
-            return rtl::OUString( ".uno:CharLeftSel" );
+            return OUString( ".uno:CharLeftSel" );
         case com::sun::star::awt::Key::SELECT_FORWARD:
-            return rtl::OUString( ".uno:CharRightSel" );
+            return OUString( ".uno:CharRightSel" );
         case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
-            return rtl::OUString( ".uno:WordLeftSel" );
+            return OUString( ".uno:WordLeftSel" );
         case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
-            return rtl::OUString( ".uno:WordRightSel" );
+            return OUString( ".uno:WordRightSel" );
         case com::sun::star::awt::Key::SELECT_WORD:
-            return rtl::OUString( ".uno:SelectWord" );
+            return OUString( ".uno:SelectWord" );
         case com::sun::star::awt::Key::SELECT_LINE:
-            return rtl::OUString();
+            return OUString();
         case com::sun::star::awt::Key::SELECT_PARAGRAPH:
-            return rtl::OUString( ".uno:SelectText" );
+            return OUString( ".uno:SelectText" );
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE:
-            return rtl::OUString( ".uno:StartOfLineSel" );
+            return OUString( ".uno:StartOfLineSel" );
         case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE:
-            return rtl::OUString( ".uno:EndOfLineSel" );
+            return OUString( ".uno:EndOfLineSel" );
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
-            return rtl::OUString( ".uno:StartOfParaSel" );
+            return OUString( ".uno:StartOfParaSel" );
         case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
-            return rtl::OUString( ".uno:EndOfParaSel" );
+            return OUString( ".uno:EndOfParaSel" );
         case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
-            return rtl::OUString( ".uno:StartOfDocumentSel" );
+            return OUString( ".uno:StartOfDocumentSel" );
         case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT:
-            return rtl::OUString( ".uno:EndOfDocumentSel" );
+            return OUString( ".uno:EndOfDocumentSel" );
         case com::sun::star::awt::Key::SELECT_ALL:
-            return rtl::OUString( ".uno:SelectAll" );
+            return OUString( ".uno:SelectAll" );
         default:
             break;
         }
     }
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-----------------------------------------------
@@ -370,7 +370,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st
     css::uno::Reference< css::frame::XModuleManager2 > xModuleDetection(
         css::frame::ModuleManager::create(rxContext));
 
-    ::rtl::OUString sModule;
+    OUString sModule;
     try
     {
         sModule = xModuleDetection->identify(xFrame);
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx
index 904d2b5d768c..c6243c1c9169 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -38,10 +38,10 @@ namespace svt
 
 using namespace ::com::sun::star;
 
-bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
+bool lcl_isNamedRange( const OUString& sAddress, const uno::Reference< frame::XModel >& xModel, table::CellRangeAddress& aAddress )
 {
     bool bRes = false;
-    const static rtl::OUString sNamedRanges("NamedRanges");
+    const static OUString sNamedRanges("NamedRanges");
     uno::Reference< sheet::XCellRangeReferrer > xReferrer;
     try
     {
@@ -67,7 +67,7 @@ bool lcl_isNamedRange( const rtl::OUString& sAddress, const uno::Reference< fram
 
 
 void
-BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const rtl::OUString& rsCtrlSource, const rtl::OUString& rsRowSource, sal_uInt16 nRefTab )
+BindableControlHelper::ApplyListSourceAndBindableData( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& rObj, const OUString& rsCtrlSource, const OUString& rsRowSource, sal_uInt16 nRefTab )
 {
 // XBindable etc.
     uno::Reference< lang::XMultiServiceFactory > xFac;
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index c94ea3a2cce6..e6a9eff4184a 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -84,9 +84,9 @@ static sal_uInt16 aWndFunc(
     String aErr(SvtResId(STR_ERR_HDLMESS).toString());
     String aAction(rAction);
     if ( aAction.Len() )
-        aAction += rtl::OUString(":\n");
-    aErr.SearchAndReplace(rtl::OUString("$(ACTION)"), aAction);
-    aErr.SearchAndReplace(rtl::OUString("$(ERROR)"), rErr);
+        aAction += OUString(":\n");
+    aErr.SearchAndReplace(OUString("$(ACTION)"), aAction);
+    aErr.SearchAndReplace(OUString("$(ERROR)"), rErr);
 
     MessBox* pBox;
     switch ( nFlags & 0xf000 )
@@ -191,7 +191,7 @@ sal_Bool SfxErrorHandler::CreateString(
         StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr);
         if(pStringInfo)
         {
-            rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"),
+            rStr = rStr.replaceAll(OUString("$(ARG1)"),
                                       pStringInfo->GetErrorString());
         }
         else
@@ -349,7 +349,7 @@ sal_Bool SfxErrorHandler::GetErrorString(
             sal_uInt16 nResFlags = aErrorString.GetFlags();
             if ( nResFlags )
                 nFlags = nResFlags;
-            rStr = rStr.replaceAll(rtl::OUString("$(ERROR)"), aErrorString.GetString());
+            rStr = rStr.replaceAll(OUString("$(ERROR)"), aErrorString.GetString());
             bRet = sal_True;
         }
         else
@@ -362,8 +362,8 @@ sal_Bool SfxErrorHandler::GetErrorString(
         GetClassString(lErrId & ERRCODE_CLASS_MASK,
                        aErrStr);
         if(aErrStr.Len())
-            aErrStr += rtl::OUString(".\n");
-        rStr = rStr.replaceAll(rtl::OUString("$(CLASS)"),aErrStr);
+            aErrStr += OUString(".\n");
+        rStr = rStr.replaceAll(OUString("$(CLASS)"),aErrStr);
     }
 
     return bRet;
@@ -417,7 +417,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
         if ( aTestEr )
         {
             rStr = ( (ResString)aTestEr ).GetString();
-            rStr = rStr.replaceAll(rtl::OUString("$(ARG1)"), aArg1 );
+            rStr = rStr.replaceAll(OUString("$(ARG1)"), aArg1 );
             bRet = true;
         }
         else
@@ -431,7 +431,7 @@ sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
             sal_uInt16 nId = ( nErrId & ERRCODE_WARNING_MASK ) ? ERRCTX_WARNING : ERRCTX_ERROR;
             ResId aSfxResId( RID_ERRCTX, *pMgr );
             ErrorResource_Impl aEr( aSfxResId, nId );
-            rStr = rStr.replaceAll( rtl::OUString("$(ERR)"), ( (ResString)aEr ).GetString() );
+            rStr = rStr.replaceAll( OUString("$(ERR)"), ( (ResString)aEr ).GetString() );
         }
     }
 
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index ad57f9ff28e4..e074a30424de 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -222,8 +222,8 @@ struct EmbeddedObjectRef_Impl
     uno::Reference <embed::XEmbeddedObject> mxObj;
 
     EmbedEventListener_Impl*                    xListener;
-    ::rtl::OUString                             aPersistName;
-    ::rtl::OUString                             aMediaType;
+    OUString                             aPersistName;
+    OUString                             aMediaType;
     comphelper::EmbeddedObjectContainer*        pContainer;
     Graphic*                                    pGraphic;
     sal_Int64                                   nViewAspect;
@@ -372,13 +372,13 @@ bool EmbeddedObjectRef::is() const
     return mpImpl->mxObj.is();
 }
 
-void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName )
+void EmbeddedObjectRef::AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const OUString& rPersistName )
 {
     mpImpl->pContainer = pContainer;
     mpImpl->aPersistName = rPersistName;
 
     if ( mpImpl->pGraphic && !mpImpl->bNeedUpdate && pContainer )
-        SetGraphicToContainer( *mpImpl->pGraphic, *pContainer, mpImpl->aPersistName, ::rtl::OUString() );
+        SetGraphicToContainer( *mpImpl->pGraphic, *pContainer, mpImpl->aPersistName, OUString() );
 }
 
 comphelper::EmbeddedObjectContainer* EmbeddedObjectRef::GetContainer() const
@@ -411,7 +411,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
     if ( bUpdate )
     {
         DELETEZ( mpImpl->pGraphic );
-        mpImpl->aMediaType = ::rtl::OUString();
+        mpImpl->aMediaType = OUString();
         mpImpl->pGraphic = new Graphic;
         mpImpl->mnGraphicVersion++;
     }
@@ -510,7 +510,7 @@ Size EmbeddedObjectRef::GetSize( MapMode* pTargetMapMode ) const
 }
 
 void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream >& xInGrStream,
-                                            const ::rtl::OUString& rMediaType )
+                                            const OUString& rMediaType )
 {
     if ( mpImpl->pGraphic )
         delete mpImpl->pGraphic;
@@ -541,7 +541,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
 
 }
 
-void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUString& rMediaType )
+void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const OUString& rMediaType )
 {
     if ( mpImpl->pGraphic )
         delete mpImpl->pGraphic;
@@ -617,7 +617,7 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const OUSt
 {
     MapMode aMM( MAP_APPFONT );
     Size aAppFontSz = pOut->LogicToLogic( Size( 0, 8 ), &aMM, NULL );
-    Font aFnt( rtl::OUString("Helvetica"), aAppFontSz );
+    Font aFnt( OUString("Helvetica"), aAppFontSz );
     aFnt.SetTransparent( true );
     aFnt.SetColor( Color( COL_LIGHTRED ) );
     aFnt.SetWeight( WEIGHT_BOLD );
@@ -739,8 +739,8 @@ bool EmbeddedObjectRef::TryRunningState( const uno::Reference < embed::XEmbedded
 
 void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic,
                                                 comphelper::EmbeddedObjectContainer& aContainer,
-                                                const ::rtl::OUString& aName,
-                                                const ::rtl::OUString& aMediaType )
+                                                const OUString& aName,
+                                                const OUString& aMediaType )
 {
     SvMemoryStream aStream;
     aStream.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
@@ -758,7 +758,7 @@ void EmbeddedObjectRef::SetGraphicToContainer( const Graphic& rGraphic,
 uno::Reference< io::XInputStream > EmbeddedObjectRef::GetGraphicReplacementStream(
                                                                 sal_Int64 nViewAspect,
                                                                 const uno::Reference< embed::XEmbeddedObject >& xObj,
-                                                                ::rtl::OUString* pMediaType )
+                                                                OUString* pMediaType )
     throw()
 {
     return ::comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream(nViewAspect,xObj,pMediaType);
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 9dfb5208eeaf..3c87d03144e3 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -105,7 +105,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D
                         if ( xPers.is() )
                         {
                             uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage();
-                            ::rtl::OUString aName( "Dummy" );
+                            OUString aName( "Dummy" );
                             SvStream* pStream = NULL;
                             sal_Bool bDeleteStream = sal_False;
                             uno::Sequence < beans::PropertyValue > aEmpty;
diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx
index 7ee8d850c0ca..88342c6fe419 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -26,7 +26,7 @@
 
 #include "svtools/filechangedchecker.hxx"
 
-FileChangedChecker::FileChangedChecker(const rtl::OUString& rFilename, const ::boost::function0<void>& rCallback) :
+FileChangedChecker::FileChangedChecker(const OUString& rFilename, const ::boost::function0<void>& rCallback) :
     mTimer(),
     mFileName(rFilename),
     mLastModTime(),
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 749bc20c01a7..fc5ce1cc5f4c 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -209,7 +209,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL )
             if ( aPath.EqualsAscii( Fac2ExtMap_Impl[ nIndex ]._pFactory ) )
             {
                 // extension found
-                aExtension = rtl::OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension);
+                aExtension = OUString::createFromAscii(Fac2ExtMap_Impl[ nIndex ]._pExtension);
                 // and return it
                 return aExtension;
             }
@@ -227,7 +227,7 @@ static String GetImageExtensionByFactory_Impl( const String& rURL )
             xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", xContext),
             ::com::sun::star::uno::UNO_QUERY );
 
-        ::rtl::OUString aInternalType = xTypeDetector->queryTypeByURL( rURL );
+        OUString aInternalType = xTypeDetector->queryTypeByURL( rURL );
         ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameAccess > xAccess( xTypeDetector, ::com::sun::star::uno::UNO_QUERY );
         ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aTypeProps;
         if ( !aInternalType.isEmpty() && xAccess->hasByName( aInternalType ) )
@@ -239,10 +239,10 @@ static String GetImageExtensionByFactory_Impl( const String& rURL )
                 const ::com::sun::star::beans::PropertyValue& rProp = aTypeProps[i];
                 if ( rProp.Name.compareToAscii("Extensions") == COMPARE_EQUAL )
                 {
-                    ::com::sun::star::uno::Sequence < ::rtl::OUString > aExtensions;
+                    ::com::sun::star::uno::Sequence < OUString > aExtensions;
                     if ( ( rProp.Value >>= aExtensions ) && aExtensions.getLength() > 0 )
                     {
-                        const ::rtl::OUString* pExtensions = aExtensions.getConstArray();
+                        const OUString* pExtensions = aExtensions.getConstArray();
                         aExtension = String( pExtensions[0] );
                         break;
                     }
@@ -454,7 +454,7 @@ static String GetDescriptionByFactory_Impl( const String& rFactory )
         SolarMutexGuard aGuard;
         return SvtResId(nResId).toString();
     }
-    return rtl::OUString();
+    return OUString();
 }
 
 static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL )
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index b21d576ab632..40df75d7e98f 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -124,7 +124,7 @@ namespace svt
     //= GraphicAccess
     //====================================================================
     //--------------------------------------------------------------------
-    bool GraphicAccess::isSupportedURL( const ::rtl::OUString& _rURL )
+    bool GraphicAccess::isSupportedURL( const OUString& _rURL )
     {
         if  (   ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/" ) ) == 0 )
             ||  ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository/" ) ) == 0 )
@@ -137,7 +137,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL )
+    SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL )
     {
         SvStream* pReturn = NULL;
 
@@ -148,7 +148,7 @@ namespace svt
 
             // let it create a graphic from the given URL
             Sequence< PropertyValue > aMediaProperties( 1 );
-            aMediaProperties[0].Name = ::rtl::OUString( "URL" );
+            aMediaProperties[0].Name = OUString( "URL" );
             aMediaProperties[0].Value <<= _rImageResourceURL;
             Reference< XGraphic > xGraphic( xProvider->queryGraphic( aMediaProperties ) );
             OSL_ENSURE( xGraphic.is(), "GraphicAccess::getImageStream: the provider did not give us a graphic object!" );
@@ -163,10 +163,10 @@ namespace svt
             );
 
             aMediaProperties.realloc( 2 );
-            aMediaProperties[0].Name = ::rtl::OUString( "OutputStream" );
+            aMediaProperties[0].Name = OUString( "OutputStream" );
             aMediaProperties[0].Value <<= xBufferAccess;
-            aMediaProperties[1].Name = ::rtl::OUString( "MimeType" );
-            aMediaProperties[1].Value <<= ::rtl::OUString( "image/png" );
+            aMediaProperties[1].Name = OUString( "MimeType" );
+            aMediaProperties[1].Value <<= OUString( "image/png" );
             xProvider->storeGraphic( xGraphic, aMediaProperties );
 
             pMemBuffer->Seek( 0 );
@@ -181,7 +181,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rImageResourceURL )
+    Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL )
     {
         return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), sal_True );   // take ownership
     }
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index ea8e24fb7e92..597d90a34a3b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -86,7 +86,7 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
     rOStm << GetVersion();
     rOStm << ( (sal_uInt16) eEncoding );
 
-    const rtl::OString aRelURL = rtl::OUStringToOString(
+    const OString aRelURL = OUStringToOString(
         URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding);
     write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, aRelURL);
     write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aAltText, eEncoding);
@@ -951,7 +951,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
     rOStm << IMAPMAGIC;
     rOStm << GetVersion();
     write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding);
-    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); //dummy
+    write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); //dummy
     rOStm << nCount;
     write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding);
 
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 562daab907de..456db307cead 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -39,7 +39,7 @@
 
 TYPEINIT0_AUTOFACTORY( ImageMap );
 
-void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const
+void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const
 {
     const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
 
@@ -50,7 +50,7 @@ void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint1
     rBuf.append(RTL_CONSTASCII_STRINGPARAM(") "));
 }
 
-void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const
+void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const
 {
     const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
 
@@ -60,20 +60,20 @@ void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint1
     rBuf.append(' ');
 }
 
-void IMapObject::AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
+void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const
 {
-    rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
+    rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
 }
 
-void IMapObject::AppendNCSAURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
+void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const String& rBaseURL) const
 {
-    rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
+    rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
     rBuf.append(' ');
 }
 
 void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
 {
-    rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle "));
+    OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle "));
 
     AppendCERNCoords(aStrBuf, aRect.TopLeft());
     AppendCERNCoords(aStrBuf, aRect.BottomRight());
@@ -84,7 +84,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) c
 
 void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
 {
-    rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect "));
+    OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect "));
 
     AppendNCSAURL(aStrBuf, rBaseURL);
     AppendNCSACoords(aStrBuf, aRect.TopLeft());
@@ -95,7 +95,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) c
 
 void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
 {
-    rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
+    OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
 
     AppendCERNCoords(aStrBuf, aCenter);
     aStrBuf.append(nRadius);
@@ -107,7 +107,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) cons
 
 void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
 {
-    rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
+    OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
 
     AppendNCSAURL(aStrBuf, rBaseURL);
     AppendNCSACoords(aStrBuf, aCenter);
@@ -118,7 +118,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons
 
 void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const
 {
-    rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon "));
+    OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon "));
     const sal_uInt16 nCount = aPoly.GetSize();
 
     for (sal_uInt16 i = 0; i < nCount; ++i)
@@ -131,7 +131,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) co
 
 void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
 {
-    rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly "));
+    OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly "));
     const sal_uInt16 nCount = Min( aPoly.GetSize(), (sal_uInt16) 100 );
 
     AppendNCSAURL(aStrBuf, rBaseURL);
@@ -241,16 +241,16 @@ sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
     // alten Inhalt loeschen
     ClearImageMap();
 
-    rtl::OString aStr;
+    OString aStr;
     while ( rIStm.ReadLine( aStr ) )
         ImpReadCERNLine( aStr, rBaseURL );
 
     return IMAP_ERR_OK;
 }
 
-void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseURL  )
+void ImageMap::ImpReadCERNLine( const OString& rLine, const String& rBaseURL  )
 {
-    rtl::OString aStr = comphelper::string::stripStart(rLine, ' ');
+    OString aStr = comphelper::string::stripStart(rLine, ' ');
     aStr = comphelper::string::stripStart(aStr, '\t');
     aStr = comphelper::string::remove(aStr, ';');
     aStr = aStr.toAsciiLowerCase();
@@ -259,13 +259,13 @@ void ImageMap::ImpReadCERNLine( const rtl::OString& rLine, const String& rBaseUR
     char        cChar = *pStr++;
 
     // Anweisung finden
-    rtl::OStringBuffer aBuf;
+    OStringBuffer aBuf;
     while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) )
     {
         aBuf.append(cChar);
         cChar = *pStr++;
     }
-    rtl::OString aToken = aBuf.makeStringAndClear();
+    OString aToken = aBuf.makeStringAndClear();
 
     if ( NOTEOL( cChar ) )
     {
@@ -368,7 +368,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr )
 
 String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
 {
-    rtl::OUString aStr(rtl::OUString::createFromAscii(*ppStr));
+    OUString aStr(OUString::createFromAscii(*ppStr));
 
     aStr = comphelper::string::stripStart(aStr, ' ');
     aStr = comphelper::string::stripStart(aStr, '\t');
@@ -383,16 +383,16 @@ sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
     // alten Inhalt loeschen
     ClearImageMap();
 
-    rtl::OString aStr;
+    OString aStr;
     while ( rIStm.ReadLine( aStr ) )
         ImpReadNCSALine( aStr, rBaseURL );
 
     return IMAP_ERR_OK;
 }
 
-void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseURL )
+void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL )
 {
-    rtl::OString aStr = comphelper::string::stripStart(rLine, ' ');
+    OString aStr = comphelper::string::stripStart(rLine, ' ');
     aStr = comphelper::string::stripStart(aStr, '\t');
     aStr = comphelper::string::remove(aStr, ';');
     aStr = aStr.toAsciiLowerCase();
@@ -401,13 +401,13 @@ void ImageMap::ImpReadNCSALine( const rtl::OString& rLine, const String& rBaseUR
     char        cChar = *pStr++;
 
     // Anweisung finden
-    rtl::OStringBuffer aBuf;
+    OStringBuffer aBuf;
     while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) )
     {
         aBuf.append(cChar);
         cChar = *pStr++;
     }
-    rtl::OString aToken = aBuf.makeStringAndClear();
+    OString aToken = aBuf.makeStringAndClear();
 
     if ( NOTEOL( cChar ) )
     {
@@ -519,7 +519,7 @@ sal_uLong ImageMap::ImpDetectFormat( SvStream& rIStm )
         long        nCount = 128;
 
         rIStm.Seek( nPos );
-        rtl::OString aStr;
+        OString aStr;
         while ( rIStm.ReadLine( aStr ) && nCount-- )
         {
             aStr = aStr.toAsciiLowerCase();
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 584a205ed9a7..b83443d2754e 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -134,7 +134,7 @@ SvtLanguageTable::~SvtLanguageTable()
 
 //------------------------------------------------------------------------
 
-const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
+const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
 {
     LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType, bUserInterfaceSelection);
     sal_uInt32 nPos = FindIndex( eLang );
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index c6d7a719338f..59bd9094a039 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -66,7 +66,7 @@ bool canRenderNameOfSelectedFont(OutputDevice &rDevice)
     return !isSymbolFont(rFont) && (STRING_LEN == rDevice.HasGlyphs(rFont, rFont.GetName()));
 }
 
-rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice)
+OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice)
 {
     const bool bOpenSymbol = isOpenSymbolFont(rDevice.GetFont());
 
@@ -104,7 +104,7 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe
                 aText[ i+1 ] = 0;
             }
 
-            return rtl::OUString(aText);
+            return OUString(aText);
         }
     }
 
@@ -113,9 +113,9 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe
     static sal_Unicode aImplStarSymbolText[] = {
         0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0};
     const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : aImplSymbolFontText;
-    rtl::OUString sSampleText(pText);
+    OUString sSampleText(pText);
     bool bHasSampleTextGlyphs = (STRING_LEN == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText));
-    return bHasSampleTextGlyphs ? sSampleText : rtl::OUString();
+    return bHasSampleTextGlyphs ? sSampleText : OUString();
 }
 
 //These ones are typically for use in the font dropdown box beside the
@@ -128,9 +128,9 @@ rtl::OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDe
 //readers of the minor languages, e.g. Yiddish is written with the HEBREW
 //script as well, the vast majority of Yiddish readers will be able to read
 //Hebrew as well.
-rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
+OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
 {
-    rtl::OUString sSampleText;
+    OUString sSampleText;
     switch (eScript)
     {
         case USCRIPT_GREEK:
@@ -138,7 +138,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aGrek[] = {
                 0x0391, 0x03BB, 0x03C6, 0x03AC, 0x03B2, 0x03B7, 0x03C4, 0x03BF
             };
-            sSampleText = rtl::OUString(aGrek, SAL_N_ELEMENTS(aGrek));
+            sSampleText = OUString(aGrek, SAL_N_ELEMENTS(aGrek));
             break;
         }
         case USCRIPT_HEBREW:
@@ -148,7 +148,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x05BC, 0x05D9, 0x05EA, 0x0020, 0x05E2, 0x05B4, 0x05D1, 0x05B0,
                 0x05E8, 0x05B4, 0x05D9
             };
-            sSampleText = rtl::OUString(aHebr, SAL_N_ELEMENTS(aHebr));
+            sSampleText = OUString(aHebr, SAL_N_ELEMENTS(aHebr));
             break;
         }
         case USCRIPT_ARABIC:
@@ -157,7 +157,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0623, 0x0628, 0x062C, 0x062F, 0x064A, 0x0629, 0x0020, 0x0639,
                 0x0631, 0x0628, 0x064A, 0x0629
             };
-            sSampleText = rtl::OUString(aArab, SAL_N_ELEMENTS(aArab));
+            sSampleText = OUString(aArab, SAL_N_ELEMENTS(aArab));
             break;
         }
         case USCRIPT_DEVANAGARI:
@@ -165,7 +165,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aDeva[] = {
                 0x0926, 0x0947, 0x0935, 0x0928, 0x093E, 0x0917, 0x0930, 0x0940
             };
-            sSampleText = rtl::OUString(aDeva, SAL_N_ELEMENTS(aDeva));
+            sSampleText = OUString(aDeva, SAL_N_ELEMENTS(aDeva));
             break;
         }
         case USCRIPT_BENGALI:
@@ -174,7 +174,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x09AC, 0x09BE, 0x0982, 0x09B2, 0x09BE, 0x0020, 0x09B2, 0x09BF,
                 0x09AA, 0x09BF
             };
-            sSampleText = rtl::OUString(aBeng, SAL_N_ELEMENTS(aBeng));
+            sSampleText = OUString(aBeng, SAL_N_ELEMENTS(aBeng));
             break;
         }
         case USCRIPT_GURMUKHI:
@@ -182,7 +182,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aGuru[] = {
                 0x0A17, 0x0A41, 0x0A30, 0x0A2E, 0x0A41, 0x0A16, 0x0A40
             };
-            sSampleText = rtl::OUString(aGuru, SAL_N_ELEMENTS(aGuru));
+            sSampleText = OUString(aGuru, SAL_N_ELEMENTS(aGuru));
             break;
         }
         case USCRIPT_GUJARATI:
@@ -191,7 +191,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0A97, 0x0AC1, 0x0A9C, 0x0AB0, 0x0ABE, 0x0AA4, 0x0aC0, 0x0020,
                 0x0AB2, 0x0ABF, 0x0AAA, 0x0ABF
             };
-            sSampleText = rtl::OUString(aGujr, SAL_N_ELEMENTS(aGujr));
+            sSampleText = OUString(aGujr, SAL_N_ELEMENTS(aGujr));
             break;
         }
         case USCRIPT_ORIYA:
@@ -200,7 +200,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0B09, 0x0B24, 0x0B4D, 0x0B15, 0x0B33, 0x0020, 0x0B32, 0x0B3F,
                 0x0B2A, 0x0B3F
             };
-            sSampleText = rtl::OUString(aOrya, SAL_N_ELEMENTS(aOrya));
+            sSampleText = OUString(aOrya, SAL_N_ELEMENTS(aOrya));
             break;
         }
         case USCRIPT_TAMIL:
@@ -209,7 +209,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0B85, 0x0BB0, 0x0BBF, 0x0B9A, 0x0BCD, 0x0B9A, 0x0BC1, 0x0BB5,
                 0x0B9F, 0x0BBF
             };
-            sSampleText = rtl::OUString(aTaml, SAL_N_ELEMENTS(aTaml));
+            sSampleText = OUString(aTaml, SAL_N_ELEMENTS(aTaml));
             break;
         }
         case USCRIPT_TELUGU:
@@ -217,7 +217,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aTelu[] = {
                 0x0C24, 0x0C46, 0x0C32, 0x0C41, 0x0C17, 0x0C41
             };
-            sSampleText = rtl::OUString(aTelu, SAL_N_ELEMENTS(aTelu));
+            sSampleText = OUString(aTelu, SAL_N_ELEMENTS(aTelu));
             break;
         }
         case USCRIPT_KANNADA:
@@ -226,7 +226,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0C95, 0x0CA8, 0x0CCD, 0x0CA8, 0x0CA1, 0x0020, 0x0CB2, 0x0CBF,
                 0x0CAA, 0x0CBF
             };
-            sSampleText = rtl::OUString(aKnda, SAL_N_ELEMENTS(aKnda));
+            sSampleText = OUString(aKnda, SAL_N_ELEMENTS(aKnda));
             break;
         }
         case USCRIPT_MALAYALAM:
@@ -235,7 +235,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0D2E, 0x0D32, 0x0D2F, 0x0D3E, 0x0D33, 0x0D32, 0x0D3F, 0x0D2A,
                 0x0D3F
             };
-            sSampleText = rtl::OUString(aMlym, SAL_N_ELEMENTS(aMlym));
+            sSampleText = OUString(aMlym, SAL_N_ELEMENTS(aMlym));
             break;
         }
         case USCRIPT_THAI:
@@ -243,7 +243,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aThai[] = {
                 0x0E2D, 0x0E31, 0x0E01, 0x0E29, 0x0E23, 0x0E44, 0x0E17, 0x0E22
             };
-            sSampleText = rtl::OUString(aThai, SAL_N_ELEMENTS(aThai));
+            sSampleText = OUString(aThai, SAL_N_ELEMENTS(aThai));
             break;
         }
         case USCRIPT_LAO:
@@ -252,7 +252,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0EAD, 0x0EB1, 0x0E81, 0x0EAA, 0x0EAD, 0x0E99, 0x0EA5, 0x0EB2,
                 0x0EA7
             };
-            sSampleText = rtl::OUString(aLao, SAL_N_ELEMENTS(aLao));
+            sSampleText = OUString(aLao, SAL_N_ELEMENTS(aLao));
             break;
         }
         case USCRIPT_GEORGIAN:
@@ -261,7 +261,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x10D3, 0x10D0, 0x10DB, 0x10EC, 0x10D4, 0x10E0, 0x10DA, 0x10DD,
                 0x10D1, 0x10D0
             };
-            sSampleText = rtl::OUString(aGeorgian, SAL_N_ELEMENTS(aGeorgian));
+            sSampleText = OUString(aGeorgian, SAL_N_ELEMENTS(aGeorgian));
             break;
         }
         case USCRIPT_HANGUL:
@@ -270,7 +270,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aHang[] = {
                 0xD55C, 0xAE00
             };
-            sSampleText = rtl::OUString(aHang, SAL_N_ELEMENTS(aHang));
+            sSampleText = OUString(aHang, SAL_N_ELEMENTS(aHang));
             break;
         }
         case USCRIPT_TIBETAN:
@@ -278,7 +278,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aTibt[] = {
                 0x0F51, 0x0F56, 0x0F74, 0x0F0B, 0x0F45, 0x0F53, 0x0F0B
             };
-            sSampleText = rtl::OUString(aTibt, SAL_N_ELEMENTS(aTibt));
+            sSampleText = OUString(aTibt, SAL_N_ELEMENTS(aTibt));
             break;
         }
         case USCRIPT_SYRIAC:
@@ -286,7 +286,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aSyri[] = {
                 0x0723, 0x071B, 0x072A, 0x0722, 0x0713, 0x0720, 0x0710
             };
-            sSampleText = rtl::OUString(aSyri, SAL_N_ELEMENTS(aSyri));
+            sSampleText = OUString(aSyri, SAL_N_ELEMENTS(aSyri));
             break;
         }
         case USCRIPT_THAANA:
@@ -294,7 +294,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aThaa[] = {
                 0x078C, 0x07A7, 0x0782, 0x07A6
             };
-            sSampleText = rtl::OUString(aThaa, SAL_N_ELEMENTS(aThaa));
+            sSampleText = OUString(aThaa, SAL_N_ELEMENTS(aThaa));
             break;
         }
         case USCRIPT_SINHALA:
@@ -303,7 +303,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x0DC1, 0x0DD4, 0x0DAF, 0x0DCA, 0x0DB0, 0x0020, 0x0DC3, 0x0DD2,
                 0x0D82, 0x0DC4, 0x0DBD
             };
-            sSampleText = rtl::OUString(aSinh, SAL_N_ELEMENTS(aSinh));
+            sSampleText = OUString(aSinh, SAL_N_ELEMENTS(aSinh));
             break;
         }
         case USCRIPT_MYANMAR:
@@ -312,7 +312,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x1019, 0x103C, 0x1014, 0x103A, 0x1019, 0x102C, 0x1021, 0x1000,
                 0x1039, 0x1001, 0x101B, 0x102C
             };
-            sSampleText = rtl::OUString(aMymr, SAL_N_ELEMENTS(aMymr));
+            sSampleText = OUString(aMymr, SAL_N_ELEMENTS(aMymr));
             break;
         }
         case USCRIPT_ETHIOPIC:
@@ -320,7 +320,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aEthi[] = {
                 0x130D, 0x12D5, 0x12DD
             };
-            sSampleText = rtl::OUString(aEthi, SAL_N_ELEMENTS(aEthi));
+            sSampleText = OUString(aEthi, SAL_N_ELEMENTS(aEthi));
             break;
         }
         case USCRIPT_CHEROKEE:
@@ -328,7 +328,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aCher[] = {
                 0x13D7, 0x13AA, 0x13EA, 0x13B6, 0x13D9, 0x13D7
             };
-            sSampleText = rtl::OUString(aCher, SAL_N_ELEMENTS(aCher));
+            sSampleText = OUString(aCher, SAL_N_ELEMENTS(aCher));
             break;
         }
         case USCRIPT_KHMER:
@@ -338,7 +338,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x1798, 0x1781, 0x17C1, 0x1798, 0x179A, 0x1797, 0x17B6, 0x179F,
                 0x17B6
             };
-            sSampleText = rtl::OUString(aKhmr, SAL_N_ELEMENTS(aKhmr));
+            sSampleText = OUString(aKhmr, SAL_N_ELEMENTS(aKhmr));
             break;
         }
         case USCRIPT_MONGOLIAN:
@@ -346,7 +346,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aMongolian[] = {
                 0x182A, 0x1822, 0x1834, 0x1822, 0x182D, 0x180C
             };
-            sSampleText = rtl::OUString(aMongolian, SAL_N_ELEMENTS(aMongolian));
+            sSampleText = OUString(aMongolian, SAL_N_ELEMENTS(aMongolian));
             break;
         }
         case USCRIPT_TAGALOG:
@@ -354,7 +354,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aTagalog[] = {
                 0x170A, 0x170A, 0x170C, 0x1712
             };
-            sSampleText = rtl::OUString(aTagalog, SAL_N_ELEMENTS(aTagalog));
+            sSampleText = OUString(aTagalog, SAL_N_ELEMENTS(aTagalog));
             break;
         }
         case USCRIPT_NEW_TAI_LUE:
@@ -362,7 +362,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aTalu[] = {
                 0x1991, 0x19BA, 0x199F, 0x19B9, 0x19C9
             };
-            sSampleText = rtl::OUString(aTalu, SAL_N_ELEMENTS(aTalu));
+            sSampleText = OUString(aTalu, SAL_N_ELEMENTS(aTalu));
             break;
         }
         case USCRIPT_TRADITIONAL_HAN:
@@ -370,7 +370,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aHant[] = {
                 0x7E41
             };
-            sSampleText = rtl::OUString(aHant, SAL_N_ELEMENTS(aHant));
+            sSampleText = OUString(aHant, SAL_N_ELEMENTS(aHant));
             break;
         }
         case USCRIPT_SIMPLIFIED_HAN:
@@ -378,7 +378,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aHans[] = {
                 0x7B80
             };
-            sSampleText = rtl::OUString(aHans, SAL_N_ELEMENTS(aHans));
+            sSampleText = OUString(aHans, SAL_N_ELEMENTS(aHans));
             break;
         }
         case USCRIPT_HAN:
@@ -386,7 +386,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aSimplifiedAndTraditionalChinese[] = {
                 0x7B80, 0x7E41
             };
-            sSampleText = rtl::OUString(aSimplifiedAndTraditionalChinese,
+            sSampleText = OUString(aSimplifiedAndTraditionalChinese,
                 SAL_N_ELEMENTS(aSimplifiedAndTraditionalChinese));
             break;
         }
@@ -395,7 +395,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aJpan[] = {
                 0x65E5, 0x672C, 0x8A9E
             };
-            sSampleText = rtl::OUString(aJpan, SAL_N_ELEMENTS(aJpan));
+            sSampleText = OUString(aJpan, SAL_N_ELEMENTS(aJpan));
             break;
         }
         case USCRIPT_YI:
@@ -403,7 +403,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aYiii[] = {
                 0xA188,  0xA320, 0xA071, 0xA0B7
             };
-            sSampleText = rtl::OUString(aYiii, SAL_N_ELEMENTS(aYiii));
+            sSampleText = OUString(aYiii, SAL_N_ELEMENTS(aYiii));
             break;
         }
         case USCRIPT_PHAGS_PA:
@@ -412,7 +412,7 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0xA84F, 0xA861, 0xA843, 0x0020, 0xA863, 0xA861, 0xA859, 0x0020,
                 0xA850, 0xA85C, 0xA85E
             };
-            sSampleText = rtl::OUString(aPhag, SAL_N_ELEMENTS(aPhag));
+            sSampleText = OUString(aPhag, SAL_N_ELEMENTS(aPhag));
             break;
         }
         case USCRIPT_TAI_LE:
@@ -421,11 +421,11 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
                 0x1956, 0x196D, 0x1970, 0x1956, 0x196C, 0x1973, 0x1951, 0x1968,
                 0x1952, 0x1970
             };
-            sSampleText = rtl::OUString(aTale, SAL_N_ELEMENTS(aTale));
+            sSampleText = OUString(aTale, SAL_N_ELEMENTS(aTale));
             break;
         }
         case USCRIPT_LATIN:
-            sSampleText = rtl::OUString("Lorem ipsum");
+            sSampleText = OUString("Lorem ipsum");
             break;
         default:
             break;
@@ -433,9 +433,9 @@ rtl::OUString makeShortRepresentativeTextForScript(UScriptCode eScript)
     return sSampleText;
 }
 
-rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
+OUString makeRepresentativeTextForScript(UScriptCode eScript)
 {
-    rtl::OUString sSampleText;
+    OUString sSampleText;
     switch (eScript)
     {
         case USCRIPT_TRADITIONAL_HAN:
@@ -446,7 +446,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aZh[] = {
                 0x4EBA, 0x4E4B, 0x521D, 0x0020, 0x6027, 0x672C, 0x5584
             };
-            sSampleText = rtl::OUString(aZh, SAL_N_ELEMENTS(aZh));
+            sSampleText = OUString(aZh, SAL_N_ELEMENTS(aZh));
             break;
         }
         case USCRIPT_JAPANESE:
@@ -455,7 +455,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
             const sal_Unicode aJa[] = {
                 0x7F8E, 0x3057, 0x3044, 0x65E5, 0x672C, 0x8A9E
             };
-            sSampleText = rtl::OUString(aJa, SAL_N_ELEMENTS(aJa));
+            sSampleText = OUString(aJa, SAL_N_ELEMENTS(aJa));
             break;
         }
         case USCRIPT_KOREAN:
@@ -466,7 +466,7 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
                 0xD0A4, 0xC2A4, 0xC758, 0x0020, 0xACE0, 0xC720, 0xC870,
                 0xAC74, 0xC740
             };
-            sSampleText = rtl::OUString(aKo, SAL_N_ELEMENTS(aKo));
+            sSampleText = OUString(aKo, SAL_N_ELEMENTS(aKo));
             break;
         }
         default:
@@ -478,9 +478,9 @@ rtl::OUString makeRepresentativeTextForScript(UScriptCode eScript)
     return sSampleText;
 }
 
-rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript)
+OUString makeShortMinimalTextForScript(UScriptCode eScript)
 {
-    rtl::OUString sSampleText;
+    OUString sSampleText;
     switch (eScript)
     {
         case USCRIPT_GREEK:
@@ -488,7 +488,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript)
             const sal_Unicode aGrek[] = {
                 0x0391, 0x0392
             };
-            sSampleText = rtl::OUString(aGrek, SAL_N_ELEMENTS(aGrek));
+            sSampleText = OUString(aGrek, SAL_N_ELEMENTS(aGrek));
             break;
         }
         case USCRIPT_HEBREW:
@@ -496,7 +496,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript)
             const sal_Unicode aHebr[] = {
                 0x05D0, 0x05D1
             };
-            sSampleText = rtl::OUString(aHebr, SAL_N_ELEMENTS(aHebr));
+            sSampleText = OUString(aHebr, SAL_N_ELEMENTS(aHebr));
             break;
         }
         default:
@@ -505,7 +505,7 @@ rtl::OUString makeShortMinimalTextForScript(UScriptCode eScript)
     return sSampleText;
 }
 
-rtl::OUString makeMinimalTextForScript(UScriptCode eScript)
+OUString makeMinimalTextForScript(UScriptCode eScript)
 {
     return makeShortMinimalTextForScript(eScript);
 }
@@ -518,9 +518,9 @@ rtl::OUString makeMinimalTextForScript(UScriptCode eScript)
 //
 //Currently we fall back to makeShortRepresentativeTextForScript when we don't
 //have suitable strings
-rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang)
+OUString makeRepresentativeTextForLanguage(LanguageType eLang)
 {
-    rtl::OUString sRet;
+    OUString sRet;
     switch( eLang & LANGUAGE_MASK_PRIMARY )
     {
         case LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY:
@@ -545,7 +545,7 @@ rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang)
                 0x0985, 0x09B8, 0x09AE, 0x09C0, 0x09AF, 0x09BC, 0x09BE,
                 0x0020, 0x0986, 0x0996, 0x09F0
             };
-            sRet = rtl::OUString(aAs, SAL_N_ELEMENTS(aAs));
+            sRet = OUString(aAs, SAL_N_ELEMENTS(aAs));
             break;
         }
         case LANGUAGE_BENGALI & LANGUAGE_MASK_PRIMARY:
@@ -619,7 +619,7 @@ rtl::OUString makeRepresentativeTextForLanguage(LanguageType eLang)
             const sal_Unicode aGa[] = {
                 'T', 0x00E9, 'a', 'c', 's', ' ', 'S', 'a', 'm', 'p', 'l', 'a', 'c', 'h'
             };
-            sRet = rtl::OUString(aGa, SAL_N_ELEMENTS(aGa));
+            sRet = OUString(aGa, SAL_N_ELEMENTS(aGa));
             break;
         }
         default:
@@ -1124,22 +1124,22 @@ namespace
             bool bKore = false, bJpan = false, bHant = false, bHans = false;
 
             const sal_Unicode aKorean[] = { 0x3131 };
-            rtl::OUString sKorean(aKorean, SAL_N_ELEMENTS(aKorean));
+            OUString sKorean(aKorean, SAL_N_ELEMENTS(aKorean));
             if (STRING_LEN == rDevice.HasGlyphs(rFont, sKorean))
                 bKore = true;
 
             const sal_Unicode aJapanese[] = { 0x3007, 0x9F9D };
-            rtl::OUString sJapanese(aJapanese, SAL_N_ELEMENTS(aJapanese));
+            OUString sJapanese(aJapanese, SAL_N_ELEMENTS(aJapanese));
             if (STRING_LEN == rDevice.HasGlyphs(rFont, sJapanese))
                 bJpan = true;
 
             const sal_Unicode aTraditionalChinese[] = { 0x570B };
-            rtl::OUString sTraditionalChinese(aTraditionalChinese, SAL_N_ELEMENTS(aTraditionalChinese));
+            OUString sTraditionalChinese(aTraditionalChinese, SAL_N_ELEMENTS(aTraditionalChinese));
             if (STRING_LEN == rDevice.HasGlyphs(rFont, sTraditionalChinese))
                 bHant = true;
 
             const sal_Unicode aSimplifiedChinese[] = { 0x56FD };
-            rtl::OUString sSimplifiedChinese(aSimplifiedChinese, SAL_N_ELEMENTS(aSimplifiedChinese));
+            OUString sSimplifiedChinese(aSimplifiedChinese, SAL_N_ELEMENTS(aSimplifiedChinese));
             if (STRING_LEN == rDevice.HasGlyphs(rFont, sSimplifiedChinese))
                 bHans = true;
 
@@ -1157,15 +1157,15 @@ namespace
     }
 }
 
-rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
+OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
 {
     vcl::FontCapabilities aFontCapabilities;
     if (!rDevice.GetFontCapabilities(aFontCapabilities))
-        return rtl::OUString();
+        return OUString();
 
 #if OSL_DEBUG_LEVEL > 2
     fprintf(stderr, "font is %s\n",
-        rtl::OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr());
+        OUStringToOString(rDevice.GetFont().GetName(), RTL_TEXTENCODING_UTF8).getStr());
     lcl_dump_unicode_coverage(aFontCapabilities.maUnicodeRange);
     lcl_dump_codepage_coverage(aFontCapabilities.maCodePageRange);
 #endif
@@ -1177,13 +1177,13 @@ rtl::OUString makeShortRepresentativeTextForSelectedFont(OutputDevice &rDevice)
     //chunk of representative text for that script
     UScriptCode eScript = getScript(aFontCapabilities);
     if (!eScript != USCRIPT_COMMON)
-        return rtl::OUString();
+        return OUString();
 
     eScript = attemptToDisambiguateHan(eScript, rDevice);
 
-    rtl::OUString sSampleText = makeShortRepresentativeTextForScript(eScript);
+    OUString sSampleText = makeShortRepresentativeTextForScript(eScript);
     bool bHasSampleTextGlyphs = (STRING_LEN == rDevice.HasGlyphs(rDevice.GetFont(), sSampleText));
-    return bHasSampleTextGlyphs ? sSampleText : rtl::OUString();
+    return bHasSampleTextGlyphs ? sSampleText : OUString();
 }
 
 UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCoverage)
@@ -1507,9 +1507,9 @@ UScriptCode otCoverageToScript(vcl::UnicodeCoverage::UnicodeCoverageEnum eOTCove
     return eRet;
 }
 
-rtl::OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont)
+OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const Font &rFont)
 {
-    rtl::OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage()));
+    OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage()));
 
     VirtualDevice aDevice;
     if (sRet.isEmpty() || (STRING_LEN != aDevice.HasGlyphs(rFont, sRet)))
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index 0ceae6dccb8a..eba7a5697c0e 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -31,7 +31,7 @@ namespace svt
     //= OStringTransferable
     //====================================================================
     //--------------------------------------------------------------------
-    OStringTransferable::OStringTransferable(const ::rtl::OUString& _rContent)
+    OStringTransferable::OStringTransferable(const OUString& _rContent)
         :TransferableHelper()
         ,m_sContent( _rContent )
     {
@@ -57,7 +57,7 @@ namespace svt
     //= OStringTransfer
     //====================================================================
     //--------------------------------------------------------------------
-    void OStringTransfer::CopyString( const ::rtl::OUString& _rContent, Window* _pWindow )
+    void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow )
     {
         OStringTransferable* pTransferable = new OStringTransferable( _rContent );
         Reference< XTransferable > xTransfer = pTransferable;
@@ -65,7 +65,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    sal_Bool OStringTransfer::PasteString( ::rtl::OUString& _rContent, Window* _pWindow )
+    sal_Bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow )
     {
         TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow );
 
@@ -89,7 +89,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    void OStringTransfer::StartStringDrag( const ::rtl::OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions )
+    void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions )
     {
         OStringTransferable* pTransferable = new OStringTransferable( _rContent );
         Reference< XTransferable > xTransfer = pTransferable;
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 84efebd54455..ee5a9c048ac8 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -279,11 +279,11 @@ namespace svt
             if ( !s_pFactory.get() )
             {
 #ifndef DISABLE_DYNLOADING
-                const ::rtl::OUString sModuleName( SVLIBRARY( "acc" ));
+                const OUString sModuleName( SVLIBRARY( "acc" ));
                 s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
                 if ( s_hAccessibleImplementationModule != NULL )
                 {
-                    const ::rtl::OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" );
+                    const OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" );
                     s_pAccessibleFactoryFunc = (GetSvtAccessibilityComponentFactory)
                         osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData );
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 2039c3d41c5b..d8103cfcd050 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -470,7 +470,7 @@ namespace svt
 
         sal_Bool    implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot );
 
-        static  rtl::OUString getCacheFileName();
+        static  OUString getCacheFileName();
         static  sal_Int32   getMagicNumber();
         static  void        normalize( TemplateFolderContent& _rState );
 
@@ -513,9 +513,9 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    rtl::OUString TemplateFolderCacheImpl::getCacheFileName()
+    OUString TemplateFolderCacheImpl::getCacheFileName()
     {
-        return rtl::OUString(".templdir.cache");
+        return OUString(".templdir.cache");
     }
 
 
@@ -581,7 +581,7 @@ namespace svt
         aParser.SetURL( _rPath, INetURLObject::WAS_ENCODED );
         if ( INET_PROT_NOT_VALID == aParser.GetProtocol() )
         {
-            rtl::OUString sURL;
+            OUString sURL;
             LocalFileHelper::ConvertPhysicalNameToURL( _rPath, sURL );
             aParser.SetURL( sURL, INetURLObject::WAS_ENCODED );
         }
@@ -601,11 +601,11 @@ namespace svt
         {
             // create a content for the current folder root
             Reference< XResultSet > xResultSet;
-            Sequence< ::rtl::OUString > aContentProperties( 4);
-            aContentProperties[0] = ::rtl::OUString( "Title" );
-            aContentProperties[1] = ::rtl::OUString( "DateModified" );
-            aContentProperties[2] = ::rtl::OUString( "DateCreated" );
-            aContentProperties[3] = ::rtl::OUString( "IsFolder" );
+            Sequence< OUString > aContentProperties( 4);
+            aContentProperties[0] = OUString( "Title" );
+            aContentProperties[1] = OUString( "DateModified" );
+            aContentProperties[2] = OUString( "DateCreated" );
+            aContentProperties[3] = OUString( "IsFolder" );
 
             // get the set of sub contents in the folder
             try
@@ -675,7 +675,7 @@ namespace svt
 
         // the template directories from the config
         const SvtPathOptions aPathOptions;
-        rtl::OUString aDirs = aPathOptions.GetTemplatePath();
+        OUString aDirs = aPathOptions.GetTemplatePath();
 
         // loop through all the root-level template folders
         sal_Int32 nIndex = 0;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index a682f54060ed..0d8ce74af190 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -142,22 +142,22 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD
 // a similar approach should be implemented for creation of the mimetype string;
 // for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype
 
-static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc )
+static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObjDesc )
 {
-    const ::rtl::OUString   aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" ));
-    const ::rtl::OUString   aClassName( rObjDesc.maClassName.GetHexName() );
-    ::rtl::OUString         aParams;
+    const OUString   aChar( RTL_CONSTASCII_USTRINGPARAM( "\"" ));
+    const OUString   aClassName( rObjDesc.maClassName.GetHexName() );
+    OUString         aParams;
 
     if( !aClassName.isEmpty() )
     {
-        aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" ));
+        aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";classname=\"" ));
         aParams += aClassName;
         aParams += aChar;
     }
 
     if( !rObjDesc.maTypeName.isEmpty() )
     {
-        aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" ));
+        aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";typename=\"" ));
         aParams += rObjDesc.maTypeName;
         aParams += aChar;
     }
@@ -180,29 +180,29 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto
                 pToAccept[nChar] = sal_True;
         }
 
-        aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" ));
+        aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";displayname=\"" ));
         aParams += ::rtl::Uri::encode( rObjDesc.maDisplayName, pToAccept, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 );
         aParams += aChar;
     }
 
-    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" ));
+    aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" ));
     aParams += OUString::number( rObjDesc.mnViewAspect );
     aParams += aChar;
 
-    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" ));
-    aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Width() );
+    aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" ));
+    aParams += OUString::valueOf( rObjDesc.maSize.Width() );
     aParams += aChar;
 
-    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" ));
-    aParams += ::rtl::OUString::valueOf( rObjDesc.maSize.Height() );
+    aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";height=\"" ));
+    aParams += OUString::valueOf( rObjDesc.maSize.Height() );
     aParams += aChar;
 
-    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" ));
-    aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() );
+    aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posx=\"" ));
+    aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() );
     aParams += aChar;
 
-    aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" ));
-    aParams += ::rtl::OUString::valueOf( rObjDesc.maDragStartPos.X() );
+    aParams += OUString( RTL_CONSTASCII_USTRINGPARAM( ";posy=\"" ));
+    aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() );
     aParams += aChar;
 
     return aParams;
@@ -222,14 +222,14 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons
 
         if( xMimeType.is() )
         {
-            const ::rtl::OUString aClassNameString( "classname" );
-            const ::rtl::OUString aTypeNameString( "typename" );
-            const ::rtl::OUString aDisplayNameString( "displayname" );
-            const ::rtl::OUString aViewAspectString( "viewaspect" );
-            const ::rtl::OUString aWidthString( "width" );
-            const ::rtl::OUString aHeightString( "height" );
-            const ::rtl::OUString aPosXString( "posx" );
-            const ::rtl::OUString aPosYString( "posy" );
+            const OUString aClassNameString( "classname" );
+            const OUString aTypeNameString( "typename" );
+            const OUString aDisplayNameString( "displayname" );
+            const OUString aViewAspectString( "viewaspect" );
+            const OUString aWidthString( "width" );
+            const OUString aHeightString( "height" );
+            const OUString aPosXString( "posx" );
+            const OUString aPosYString( "posy" );
 
             if( xMimeType->hasParameter( aClassNameString ) )
             {
@@ -436,7 +436,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
 
 #ifdef DEBUG
             if( maAny.hasValue() && ::com::sun::star::uno::TypeClass_STRING != maAny.getValueType().getTypeClass() )
-                fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", rtl::OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
+                fprintf( stderr, "TransferableHelper delivers sequence of data [ %s ]\n", OUStringToOString(rFlavor.MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
 #endif
         }
         catch( const ::com::sun::star::uno::Exception& )
@@ -645,7 +645,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor )
 
 #ifdef DEBUG
                 fprintf( stderr, "TransferableHelper exchanged objectdescriptor [ %s ]\n",
-                         rtl::OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
+                         OUStringToOString(aIter->MimeType, RTL_TEXTENCODING_ASCII_US).getStr() );
 #endif
             }
 
@@ -742,7 +742,7 @@ sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& )
 
 // -----------------------------------------------------------------------------
 
-sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const DataFlavor& rFlavor )
+sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor )
 {
     DataFlavor aFileFlavor;
 
@@ -750,7 +750,7 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da
         SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) &&
         TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) )
     {
-        const rtl::OString aByteStr(rtl::OUStringToOString(rString, osl_getThreadTextEncoding()));
+        const OString aByteStr(OUStringToOString(rString, osl_getThreadTextEncoding()));
         Sequence< sal_Int8 >    aSeq( aByteStr.getLength() + 1 );
 
         memcpy( aSeq.getArray(), aByteStr.getStr(), aByteStr.getLength() );
@@ -849,9 +849,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
     {
         case( SOT_FORMATSTR_ID_SOLK ):
         {
-            rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet));
-            rtl::OString sDesc(rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet));
-            rtl::OStringBuffer sOut;
+            OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet));
+            OString sDesc(OUStringToOString(rBmk.GetDescription(), eSysCSet));
+            OStringBuffer sOut;
             sOut.append(sURL.getLength());
             sOut.append('@').append(sURL);
             sOut.append(sDesc.getLength());
@@ -864,12 +864,12 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
         break;
 
         case( FORMAT_STRING ):
-            maAny <<= ::rtl::OUString( rBmk.GetURL() );
+            maAny <<= OUString( rBmk.GetURL() );
             break;
 
         case( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ):
         {
-            rtl::OString sURL(rtl::OUStringToOString(rBmk.GetURL(), eSysCSet));
+            OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet));
             Sequence< sal_Int8 > aSeq( sURL.getLength() );
             memcpy( aSeq.getArray(), sURL.getStr(), sURL.getLength() );
             maAny <<= aSeq;
@@ -881,8 +881,8 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
             Sequence< sal_Int8 > aSeq( 2048 );
 
             memset( aSeq.getArray(), 0, 2048 );
-            strcpy( reinterpret_cast< char* >( aSeq.getArray() ), rtl::OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() );
-            strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, rtl::OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() );
+            strcpy( reinterpret_cast< char* >( aSeq.getArray() ), OUStringToOString(rBmk.GetURL(), eSysCSet).getStr() );
+            strcpy( reinterpret_cast< char* >( aSeq.getArray() ) + 1024, OUStringToOString(rBmk.GetDescription(), eSysCSet).getStr() );
 
             maAny <<= aSeq;
         }
@@ -899,7 +899,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
             memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) );
             rFDesc1.dwFlags = FD_LINKUI;
 
-            rtl::OStringBuffer aStr(rtl::OUStringToOString(
+            OStringBuffer aStr(OUStringToOString(
                 rBmk.GetDescription(), eSysCSet));
             for( sal_uInt16 nChar = 0; nChar < aStr.getLength(); ++nChar )
                 if( strchr( "\\/:*?\"<>|", aStr[nChar] ) )
@@ -916,7 +916,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
         case SOT_FORMATSTR_ID_FILECONTENT:
         {
             String aStr( RTL_CONSTASCII_USTRINGPARAM( "[InternetShortcut]\x0aURL=" ) );
-            maAny <<= ::rtl::OUString( aStr += rBmk.GetURL() );
+            maAny <<= OUString( aStr += rBmk.GetURL() );
         }
         break;
 #endif
@@ -965,7 +965,7 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec
             //              writes now UTF16 format into the stream
             //JP 6.8.2001:  and now it writes UTF8 because then exist no problem with
             //              little / big endians! - Bug 88121
-            maAny <<= ::rtl::OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 );
+            maAny <<= OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 );
         }
         else
             maAny <<= aSeq;
@@ -1332,7 +1332,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
         Reference< XComponentContext >          xContext( ::comphelper::getProcessComponentContext() );
         Reference< XMimeContentTypeFactory >    xMimeFact = MimeContentTypeFactory::create( xContext );
         DataFlavorEx                            aFlavorEx;
-        const ::rtl::OUString                   aCharsetStr( "charset" );
+        const OUString                   aCharsetStr( "charset" );
 
 
         for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ )
@@ -1380,33 +1380,33 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
                 aFlavorEx.mnSotId = SOT_FORMATSTR_ID_HTML_NO_COMMENT;
                 rDataFlavorExVector.push_back( aFlavorEx );
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/plain" ) ) )
             {
                 // add, if it is a UTF-8 byte buffer
                 if( xMimeType->hasParameter( aCharsetStr ) )
                 {
-                    if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) ||
-                        xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) )
+                    if( xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( OUString( "unicode" ) ) ||
+                        xMimeType->getParameterValue( aCharsetStr ).equalsIgnoreAsciiCase( OUString( "utf-16" ) ) )
                     {
                         rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_STRING;
 
                     }
                 }
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/rtf" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/rtf" ) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = FORMAT_RTF;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/html" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/html" ) ) )
 
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_HTML;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/uri-list" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/uri-list" ) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMAT_FILE_LIST;
             }
-            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml" ) ) )
+            else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( OUString( "application/x-openoffice-objectdescriptor-xml" ) ) )
             {
                 rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR;
             }
@@ -1597,7 +1597,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const
 
 sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& rStr )
 {
-    ::rtl::OUString aOUString;
+    OUString aOUString;
     sal_Bool        bRet = GetString( nFormat, aOUString );
 
     rStr = aOUString;
@@ -1609,7 +1609,7 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& r
 
 sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& rStr )
 {
-    ::rtl::OUString aOUString;
+    OUString aOUString;
     sal_Bool        bRet = GetString( rFlavor, aOUString );
 
     rStr = aOUString;
@@ -1619,7 +1619,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& r
 
 // -----------------------------------------------------------------------------
 
-sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, ::rtl::OUString& rStr )
+sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr )
 {
     DataFlavor aFlavor;
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetString( aFlavor, rStr ) );
@@ -1627,14 +1627,14 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, ::rtl::OU
 
 // -----------------------------------------------------------------------------
 
-sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OUString& rStr )
+sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr )
 {
     Any         aAny( GetAny( rFlavor ) );
     sal_Bool    bRet = sal_False;
 
     if( aAny.hasValue() )
     {
-        ::rtl::OUString         aOUString;
+        OUString         aOUString;
         Sequence< sal_Int8 >    aSeq;
 
         if( aAny >>= aOUString )
@@ -1653,7 +1653,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, ::rtl::OU
             while( nLen && ( 0 == *( pChars + nLen - 1 ) ) )
                 --nLen;
 
-            rStr = ::rtl::OUString( pChars, nLen, osl_getThreadTextEncoding() );
+            rStr = OUString( pChars, nLen, osl_getThreadTextEncoding() );
             bRet = sal_True;
         }
     }
@@ -1943,12 +1943,12 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
 
                 if( pFDesc->cItems )
                 {
-                    rtl::OString aDesc( pFDesc->fgd[ 0 ].cFileName );
+                    OString aDesc( pFDesc->fgd[ 0 ].cFileName );
                     rtl_TextEncoding    eTextEncoding = osl_getThreadTextEncoding();
 
                     if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL")) )
                     {
-                        SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( rtl::OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
+                        SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
                                                                                   STREAM_STD_READ );
 
                         if( !pStream || pStream->GetError() )
@@ -1969,7 +1969,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
 
                         if( pStream )
                         {
-                            rtl::OString aLine;
+                            OString aLine;
                             sal_Bool    bSttFnd = sal_False;
 
                             while( pStream->ReadLine( aLine ) )
@@ -1978,8 +1978,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
                                     bSttFnd = sal_True;
                                 else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("URL=")))
                                 {
-                                    rBmk = INetBookmark( rtl::OStringToOUString(aLine.copy(4), eTextEncoding),
-                                                         rtl::OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) );
+                                    rBmk = INetBookmark( OStringToOUString(aLine.copy(4), eTextEncoding),
+                                                         OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) );
                                     bRet = sal_True;
                                     break;
                                 }
@@ -2050,11 +2050,11 @@ sal_Bool TransferableDataHelper::GetFileList(
             {
                 if( aFlavor.MimeType.indexOf( "text/uri-list" ) > -1 )
                 {
-                    rtl::OString aDiskString;
+                    OString aDiskString;
 
                     while( xStm->ReadLine( aDiskString ) )
                         if( !aDiskString.isEmpty() && aDiskString[0] != '#' )
-                            rFileList.AppendFile( rtl::OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) );
+                            rFileList.AppendFile( OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) );
 
                     bRet = sal_True;
                  }
@@ -2256,22 +2256,22 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::
         {
             if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( xRequestType2->getFullMediaType() ) )
             {
-                if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "text/plain" ) ) )
+                if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( OUString( "text/plain" ) ) )
                 {
                     // special handling for text/plain media types
-                    const ::rtl::OUString aCharsetString( "charset" );
+                    const OUString aCharsetString( "charset" );
 
                     if( !xRequestType2->hasParameter( aCharsetString ) ||
-                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "utf-16" ) ) ||
-                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( ::rtl::OUString( "unicode" ) ) )
+                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( OUString( "utf-16" ) ) ||
+                        xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( OUString( "unicode" ) ) )
                     {
                         bRet = sal_True;
                     }
                 }
-                else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( ::rtl::OUString( "application/x-openoffice" ) ) )
+                else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( OUString( "application/x-openoffice" ) ) )
                 {
                     // special handling for application/x-openoffice media types
-                    const ::rtl::OUString aFormatString( "windows_formatname" );
+                    const OUString aFormatString( "windows_formatname" );
 
                     if( xRequestType1->hasParameter( aFormatString ) &&
                         xRequestType2->hasParameter( aFormatString ) &&
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index f28c101eae40..5fc1d14ab3f6 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -498,7 +498,7 @@ void TransferDataContainer::CopyAnyData( sal_uLong nFormatId,
 // -----------------------------------------------------------------------------
 
 void TransferDataContainer::CopyByteString( sal_uLong nFormatId,
-                                            const rtl::OString& rStr )
+                                            const OString& rStr )
 {
     CopyAnyData( nFormatId, rStr.getStr(), rStr.getLength() );
 }
@@ -553,7 +553,7 @@ void TransferDataContainer::CopyString( sal_uInt16 nFmt, const String& rStr )
     {
         TDataCntnrEntry_Impl aEntry;
         aEntry.nId = nFmt;
-        rtl::OUString aStr( rStr );
+        OUString aStr( rStr );
         aEntry.aAny <<= aStr;
         pImpl->aFmtList.push_back( aEntry );
          AddFormat( aEntry.nId );
author	Luboš Luňák <l.lunak@suse.cz>	2013-04-07 12:06:47 +0200
committer	Luboš Luňák <l.lunak@suse.cz>	2013-04-07 14:23:11 +0200
commit	1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
tree	e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svtools/source/misc
parent	Typo in comment in resmgr.hxx (diff)
download	core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip