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

16 files changed, 152 insertions, 152 deletions

diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index b1b9316afcd3..435dda8d4626 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.hxx
@@ -57,7 +57,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     if( !*ppFactory )                                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
-            rtl::OUString( #ClassName ), ClassName::CreateInstance );     \
+            OUString( #ClassName ), ClassName::CreateInstance );     \
     }                                                                     \
     return *ppFactory;                                                    \
 }                                                                         \
@@ -93,7 +93,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     if( !*ppFactory )                                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
-            rtl::OUString( #ClassName ), ClassName::CreateInstance );     \
+            OUString( #ClassName ), ClassName::CreateInstance );     \
         (*ppFactory)->PutSuperClass( Super1::ClassFactory() );            \
     }                                                                     \
     return *ppFactory;                                                    \
@@ -134,7 +134,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     if( !*ppFactory )                                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
-            rtl::OUString( #ClassName ), ClassName::CreateInstance );     \
+            OUString( #ClassName ), ClassName::CreateInstance );     \
         (*ppFactory)->PutSuperClass( Super1::ClassFactory() );            \
         (*ppFactory)->PutSuperClass( Super2::ClassFactory() );            \
     }                                                                     \
@@ -175,7 +175,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     if( !*ppFactory )                                                     \
     {                                                                     \
         *ppFactory = new FactoryName( GlobalName,                         \
-            rtl::OUString( #ClassName ), ClassName::CreateInstance );     \
+            OUString( #ClassName ), ClassName::CreateInstance );     \
         (*ppFactory)->PutSuperClass( Super1::ClassFactory() );            \
         (*ppFactory)->PutSuperClass( Super2::ClassFactory() );            \
         (*ppFactory)->PutSuperClass( Super3::ClassFactory() );            \
@@ -220,7 +220,7 @@ SotFactory * ClassName::ClassFactory()                                     \
     if( !*ppFactory )                                                     \
     {                                                                     \
         *ppFactory = new SotFactory( GlobalName,                           \
-            rtl::OUString( #ClassName ), ClassName::CreateInstance );     \
+            OUString( #ClassName ), ClassName::CreateInstance );     \
         (*ppFactory)->PutSuperClass( Super1::ClassFactory() );            \
         (*ppFactory)->PutSuperClass( Super2::ClassFactory() );            \
         (*ppFactory)->PutSuperClass( Super3::ClassFactory() );            \
diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index 61a047650a3c..bd124cc8df00 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -113,7 +113,7 @@ public:
     virtual sal_Bool                Revert() = 0;
     virtual BaseStorageStream*  OpenStream( const String & rEleName,
                                   StreamMode = STREAM_STD_READWRITE,
-                                  sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 ) = 0;
+                                  sal_Bool bDirect = sal_True, const OString* pKey=0 ) = 0;
     virtual BaseStorage*        OpenStorage( const String & rEleName,
                                    StreamMode = STREAM_STD_READWRITE,
                                    bool bDirect = false ) = 0;
@@ -213,7 +213,7 @@ public:
     virtual sal_Bool                Revert();
     virtual BaseStorageStream*  OpenStream( const String & rEleName,
                                   StreamMode = STREAM_STD_READWRITE,
-                                  sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 );
+                                  sal_Bool bDirect = sal_True, const OString* pKey=0 );
     virtual BaseStorage*        OpenStorage( const String & rEleName,
                                        StreamMode = STREAM_STD_READWRITE,
                                        bool bDirect = false );
@@ -249,7 +249,7 @@ protected:
                                 ~UCBStorageStream();
 public:
                                 TYPEINFO();
-                                UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
+                                UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress );
                                 UCBStorageStream( UCBStorageStream_Impl* );
 
     virtual sal_uLong               Read( void * pData, sal_uLong nSize );
@@ -329,7 +329,7 @@ public:
     virtual sal_Bool                Revert();
     virtual BaseStorageStream*  OpenStream( const String & rEleName,
                                   StreamMode = STREAM_STD_READWRITE,
-                                  sal_Bool bDirect = sal_True, const rtl::OString* pKey=0 );
+                                  sal_Bool bDirect = sal_True, const OString* pKey=0 );
     virtual BaseStorage*        OpenStorage( const String & rEleName,
                                        StreamMode = STREAM_STD_READWRITE,
                                        bool bDirect = false );
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 2f92517270c0..db3995dfc374 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -103,7 +103,7 @@ friend class SvStorage;
     String      m_aName;      // Name des Storage
     sal_Bool        m_bIsRoot:1,  // z.B.: File-Storage
                 m_bDelStm:1;
-    rtl::OString m_aKey;           // aKey.Len != 0  -> Verschluesselung
+    OString m_aKey;           // aKey.Len != 0  -> Verschluesselung
     long        m_nVersion;
 
 protected:
@@ -132,7 +132,7 @@ public:
 
     virtual sal_Bool        Validate();
 
-    const rtl::OString& GetKey() const;
+    const OString& GetKey() const;
 
     void                SetVersion( long nVers )
                         {
diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index dc4b38f782e9..6113b9dc0fbb 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -51,8 +51,8 @@ namespace
                           sal_uLong nSize );
         bool checkStorage( const SotStorageRef &xObjStor );
 
-        virtual bool load(const rtl::OUString &,
-            const rtl::OUString &rURL, const rtl::OUString &,
+        virtual bool load(const OUString &,
+            const OUString &rURL, const OUString &,
             unsigned int, unsigned int, unsigned int);
 
         void test();
@@ -120,8 +120,8 @@ namespace
         return true;
     }
 
-    bool SotTest::load(const rtl::OUString &,
-        const rtl::OUString &rURL, const rtl::OUString &,
+    bool SotTest::load(const OUString &,
+        const OUString &rURL, const OUString &,
         unsigned int, unsigned int, unsigned int)
     {
         SvFileStream aStream(rURL, STREAM_READ);
@@ -135,9 +135,9 @@ namespace
 
     void SotTest::test()
     {
-        testDir(rtl::OUString(),
+        testDir(OUString(),
             getURLFromSrc("/sot/qa/cppunit/data/"),
-            rtl::OUString());
+            OUString());
     }
 
     CPPUNIT_TEST_SUITE_REGISTRATION(SotTest);
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 69164b07eff3..a9f1db500ffe 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -62,7 +62,7 @@ namespace
             static const DataFlavorRepresentation aInstance[] =
             {
             /*  0 SOT_FORMAT_SYSTEM_START*/                 { "", "", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /*  1 SOT_FORMAT_STRING*/                       { "text/plain;charset=utf-16", "Text", &::getCppuType( (const ::rtl::OUString*) 0 ) },
+            /*  1 SOT_FORMAT_STRING*/                       { "text/plain;charset=utf-16", "Text", &::getCppuType( (const OUString*) 0 ) },
             /*  2 SOT_FORMAT_BITMAP*/                       { "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*  3 SOT_FORMAT_GDIMETAFILE*/                  { "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /*  4 SOT_FORMAT_PRIVATE*/                      { "application/x-openoffice-private;windows_formatname=\"Private\"", "Private", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
@@ -261,7 +261,7 @@ sal_uLong SotExchange::RegisterFormatName( const String& rName )
 
     pNewFlavor->MimeType = rName;
     pNewFlavor->HumanPresentableName = rName;
-    pNewFlavor->DataType = ::getCppuType( (const ::rtl::OUString*) 0 );
+    pNewFlavor->DataType = ::getCppuType( (const OUString*) 0 );
 
     rL.push_back( pNewFlavor );
 
@@ -296,7 +296,7 @@ sal_uLong SotExchange::RegisterFormatMimeType( const String& rMimeType )
 
     pNewFlavor->MimeType = rMimeType;
     pNewFlavor->HumanPresentableName = rMimeType;
-    pNewFlavor->DataType = ::getCppuType( (const ::rtl::OUString*) 0 );
+    pNewFlavor->DataType = ::getCppuType( (const OUString*) 0 );
 
     rL.push_back( pNewFlavor );
 
@@ -336,8 +336,8 @@ sal_Bool SotExchange::GetFormatDataFlavor( sal_uLong nFormat, DataFlavor& rFlavo
     if( SOT_FORMATSTR_ID_USER_END >= nFormat )
     {
         const DataFlavorRepresentation& rData = FormatArray_Impl::get()[nFormat];
-        rFlavor.MimeType = ::rtl::OUString::createFromAscii( rData.pMimeType );
-        rFlavor.HumanPresentableName = ::rtl::OUString::createFromAscii( rData.pName );
+        rFlavor.MimeType = OUString::createFromAscii( rData.pMimeType );
+        rFlavor.HumanPresentableName = OUString::createFromAscii( rData.pName );
         rFlavor.DataType = *rData.pType;
 
         bRet = sal_True;
@@ -417,7 +417,7 @@ sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
 
     // dann in der dynamischen Liste
     tDataFlavorList& rL = InitFormats_Impl();
-    ::rtl::OUString aMimeType( rMimeType );
+    OUString aMimeType( rMimeType );
     for( i = 0, nMax = rL.size(); i < nMax; i++ )
     {
         DataFlavor* pFlavor = rL[ i ];
@@ -437,7 +437,7 @@ sal_uLong SotExchange::GetFormatIdFromMimeType( const String& rMimeType )
 sal_uLong SotExchange::GetFormat( const DataFlavor& rFlavor )
 {
     // teste zuerst die Standard - Name
-    const ::rtl::OUString& rMimeType = rFlavor.MimeType;
+    const OUString& rMimeType = rFlavor.MimeType;
     const String aMimeType( rMimeType );
     sal_uLong i, nMax = SOT_FORMAT_FILE_LIST;
     const DataFlavorRepresentation *pFormatArray_Impl = FormatArray_Impl::get();
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 2f904526b0bf..620b997e3d3c 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1311,7 +1311,7 @@ static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >*
 
                                 if( pFDesc->cItems )
                                 {
-                                    rtl::OString sDesc( pFDesc->fgd[ 0 ].cFileName );
+                                    OString sDesc( pFDesc->fgd[ 0 ].cFileName );
                                     bRet = 4 < sDesc.getLength() && sDesc.copy(sDesc.getLength()-4).equalsIgnoreAsciiCase(".URL");
                                 }
                             }
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 04cd70e082ba..635272acdd6f 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -633,7 +633,7 @@ BaseStorage* Storage::OpenStorage( const String& rName, StreamMode m, bool bDire
 // Open a stream
 
 BaseStorageStream* Storage::OpenStream( const String& rName, StreamMode m, sal_Bool,
-const rtl::OString*
+const OString*
 #ifdef DBG_UTIL
 pB
 #endif
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index fc110ad35b0b..e79e8f0a880e 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -786,7 +786,7 @@ StgDirStrm::StgDirStrm( StgIo& r )
     {
         StgEntry aRoot;
         aRoot.Init();
-        aRoot.SetName( rtl::OUString("Root Entry") );
+        aRoot.SetName( OUString("Root Entry") );
         aRoot.SetType( STG_ROOT );
         pRoot = new StgDirEntry( aRoot );
         pRoot->SetDirty();
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 48938f5604d9..265381e0c257 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -337,7 +337,7 @@ void StgEntry::GetName( String& rName ) const
     sal_uInt16 n = nNameLen;
     if( n )
         n = ( n >> 1 ) - 1;
-    rName = rtl::OUString(nName, n);
+    rName = OUString(nName, n);
 }
 
 // Compare two entries. Do this case-insensitive.
@@ -397,7 +397,7 @@ sal_Bool StgEntry::Load( const void* pFrom, sal_uInt32 nBufSize )
         return sal_False;
     }
 
-    aName = rtl::OUString( nName, n );
+    aName = OUString( nName, n );
     // I don't know the locale, so en_US is hopefully fine
     aName = ToUpperUnicode( aName );
     aName.Erase( nMaxLegalStr );
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 55639a7a4364..ac7682b4af10 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -92,7 +92,7 @@ void StgInternalStream::Commit()
 ///////////////////////// class StgCompObjStream /////////////////////////
 
 StgCompObjStream::StgCompObjStream( BaseStorage& rStg, sal_Bool bWr )
-            : StgInternalStream( rStg, rtl::OUString("\1CompObj"), bWr )
+            : StgInternalStream( rStg, OUString("\1CompObj"), bWr )
 {
     memset( &aClsId, 0, sizeof( ClsId ) );
     nCbFormat = 0;
@@ -144,7 +144,7 @@ sal_Bool StgCompObjStream::Store()
     if( GetError() != SVSTREAM_OK )
         return sal_False;
     Seek( 0L );
-    rtl::OString aAsciiUserName(rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252));
+    OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252));
     *this << (sal_Int16) 1          // Version?
               << (sal_Int16) -2                     // 0xFFFE = Byte Order Indicator
               << (sal_Int32) 0x0A03         // Windows 3.10
@@ -162,7 +162,7 @@ sal_Bool StgCompObjStream::Store()
 /////////////////////////// class StgOleStream ///////////////////////////
 
 StgOleStream::StgOleStream( BaseStorage& rStg, sal_Bool bWr )
-            : StgInternalStream( rStg, rtl::OUString("\1Ole"), bWr )
+            : StgInternalStream( rStg, OUString("\1Ole"), bWr )
 {
     nFlags = 0;
 }
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 52057a4759bb..02e65bd8ff93 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -439,7 +439,7 @@ void SotStorage::CreateStorage( sal_Bool bForceUCBStorage, StreamMode nMode, Sto
         INetURLObject aObj( m_aName );
         if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
         {
-            rtl::OUString aURL;
+            OUString aURL;
             ::utl::LocalFileHelper::ConvertPhysicalNameToURL( m_aName, aURL );
             aObj.SetURL( aURL );
             m_aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -658,7 +658,7 @@ sal_Bool SotStorage::IsStorageFile( const String & rFileName )
     INetURLObject aObj( aName );
     if ( aObj.GetProtocol() == INET_PROT_NOT_VALID )
     {
-        rtl::OUString aURL;
+        OUString aURL;
         ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL );
         aObj.SetURL( aURL );
         aName = aObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -701,7 +701,7 @@ const String & SotStorage::GetName() const
     return m_aName;
 }
 
-const rtl::OString& SotStorage::GetKey() const
+const OString& SotStorage::GetKey() const
 {
     return m_aKey;
 }
@@ -1083,8 +1083,8 @@ SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < c
         {
             uno::Reference < beans::XPropertySet > xStreamProps( xStream, uno::UNO_QUERY_THROW );
             xStreamProps->setPropertyValue(
-                        ::rtl::OUString(  "MediaType"  ),
-                        uno::makeAny( ::rtl::OUString(  "application/vnd.sun.star.oleobject"  ) ) );
+                        OUString(  "MediaType"  ),
+                        uno::makeAny( OUString(  "application/vnd.sun.star.oleobject"  ) ) );
         }
 
            pStream = utl::UcbStreamHelper::CreateStream( xStream );
@@ -1105,8 +1105,8 @@ sal_Int32 SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::s
     if ( !xProps.is() )
         return 0;
 
-    ::rtl::OUString aMediaType;
-    xProps->getPropertyValue( ::rtl::OUString("MediaType") ) >>= aMediaType;
+    OUString aMediaType;
+    xProps->getPropertyValue( OUString("MediaType") ) >>= aMediaType;
     if ( !aMediaType.isEmpty() )
     {
         ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index df1c12c59262..34a664fde425 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -38,7 +38,7 @@ sal_uLong ReadClipboardFormat( SvStream & rStm )
         sal_Char * p = new( ::std::nothrow ) sal_Char[ nLen ];
         if( p && rStm.Read( p, nLen ) == (sal_uLong) nLen )
         {
-            nFormat = SotExchange::RegisterFormatName(rtl::OUString(p, nLen-1, RTL_TEXTENCODING_ASCII_US));
+            nFormat = SotExchange::RegisterFormatName(OUString(p, nLen-1, RTL_TEXTENCODING_ASCII_US));
         }
         else
             rStm.SetError( SVSTREAM_GENERALERROR );
@@ -71,7 +71,7 @@ void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat )
         aCbFmt = SotExchange::GetFormatName( nFormat );
     if( aCbFmt.Len() )
     {
-        rtl::OString aAsciiCbFmt(rtl::OUStringToOString(aCbFmt,
+        OString aAsciiCbFmt(OUStringToOString(aCbFmt,
             RTL_TEXTENCODING_ASCII_US));
         rStm << (sal_Int32) (aAsciiCbFmt.getLength() + 1);
         rStm << (const char *)aAsciiCbFmt.getStr();
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 6771dcc45ee7..71d541ea12ac 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -140,7 +140,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData
     checkConnected();
 
     if (nBytesToRead < 0)
-        throw BufferSizeExceededException(::rtl::OUString(),static_cast<XWeak*>(this));
+        throw BufferSizeExceededException(OUString(),static_cast<XWeak*>(this));
 
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -168,7 +168,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& a
     checkError();
 
     if (nMaxBytesToRead < 0)
-        throw BufferSizeExceededException(::rtl::OUString(),static_cast<XWeak*>(this));
+        throw BufferSizeExceededException(OUString(),static_cast<XWeak*>(this));
 
     if (m_pSvStream->IsEof())
     {
@@ -282,7 +282,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength(  ) throw (IOException, Run
 void FileStreamWrapper_Impl::checkConnected()
 {
     if ( !m_aURL.Len() )
-        throw NotConnectedException(::rtl::OUString(), const_cast<XWeak*>(static_cast<const XWeak*>(this)));
+        throw NotConnectedException(OUString(), const_cast<XWeak*>(static_cast<const XWeak*>(this)));
     if ( !m_pSvStream )
     {
         m_pSvStream = ::utl::UcbStreamHelper::CreateStream( m_aURL, STREAM_STD_READ );
@@ -299,7 +299,7 @@ void FileStreamWrapper_Impl::checkError()
 
     if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE)
         // TODO: really evaluate the error
-        throw NotConnectedException(::rtl::OUString(), const_cast<XWeak*>(static_cast<const XWeak*>(this)));
+        throw NotConnectedException(OUString(), const_cast<XWeak*>(static_cast<const XWeak*>(this)));
 }
 
 TYPEINIT1( UCBStorageStream, BaseStorageStream );
@@ -418,7 +418,7 @@ public:
     String                      m_aURL;         // the full path name to create the content
     String                      m_aContentType;
     String                      m_aOriginalContentType;
-    rtl::OString                m_aKey;
+    OString                m_aKey;
     ::ucbhelper::Content*       m_pContent;     // the content that provides the data
     Reference<XInputStream>     m_rSource;      // the stream covering the original data of the content
     SvStream*                   m_pStream;      // the stream worked on; for readonly streams it is the original stream of the content
@@ -435,7 +435,7 @@ public:
                                                 // reference is destroyed
     sal_Bool                        m_bIsOLEStorage;// an OLEStorage on a UCBStorageStream makes this an Autocommit-stream
 
-                                UCBStorageStream_Impl( const String&, StreamMode, UCBStorageStream*, sal_Bool, const rtl::OString* pKey=0, sal_Bool bRepair = sal_False, Reference< XProgressHandler > xProgress = Reference< XProgressHandler >() );
+                                UCBStorageStream_Impl( const String&, StreamMode, UCBStorageStream*, sal_Bool, const OString* pKey=0, sal_Bool bRepair = sal_False, Reference< XProgressHandler > xProgress = Reference< XProgressHandler >() );
 
     void                        Free();
     sal_Bool                        Init();
@@ -504,7 +504,7 @@ public:
     sal_Bool                        Revert();
     sal_Bool                        Insert( ::ucbhelper::Content *pContent );
     UCBStorage_Impl*            OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect );
-    UCBStorageStream_Impl*      OpenStream( UCBStorageElement_Impl*, StreamMode, sal_Bool, const rtl::OString* pKey=0 );
+    UCBStorageStream_Impl*      OpenStream( UCBStorageElement_Impl*, StreamMode, sal_Bool, const OString* pKey=0 );
     void                        SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const String& );
     void                        GetProps( sal_Int32&, Sequence < Sequence < PropertyValue > >& rSequence, const String& );
     sal_Int32                   GetObjectCount();
@@ -547,7 +547,7 @@ struct UCBStorageElement_Impl
     UCBStorage_ImplRef          m_xStorage;     // reference to the "real" storage
     UCBStorageStream_ImplRef    m_xStream;      // reference to the "real" stream
 
-                                UCBStorageElement_Impl( const ::rtl::OUString& rName,
+                                UCBStorageElement_Impl( const OUString& rName,
                                             sal_Bool bIsFolder = sal_False, sal_uLong nSize = 0 )
                                     : m_aName( rName )
                                     , m_aOriginalName( rName )
@@ -628,7 +628,7 @@ sal_Bool UCBStorageElement_Impl::IsModified()
     return bModified;
 }
 
-UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nMode, UCBStorageStream* pStream, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress  )
+UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nMode, UCBStorageStream* pStream, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress  )
     : m_pAntiImpl( pStream )
     , m_aURL( rName )
     , m_pContent( NULL )
@@ -650,13 +650,13 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM
         // create the content
         Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
 
-        ::rtl::OUString aTemp( rName );
+        OUString aTemp( rName );
 
         if ( bRepair )
         {
             xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
                                                      xProgress );
-            aTemp += rtl::OUString("?repairpackage");
+            aTemp += OUString("?repairpackage");
         }
 
         m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() );
@@ -674,7 +674,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const String& rName, StreamMode nM
                 ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 );
                 ::com::sun::star::uno::Any aAny;
                 aAny <<= aSequ;
-                m_pContent->setPropertyValue( ::rtl::OUString("EncryptionKey"), aAny );
+                m_pContent->setPropertyValue( OUString("EncryptionKey"), aAny );
             }
         }
     }
@@ -812,7 +812,7 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary()
         }
         catch (const Exception &e)
         {
-            OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+            OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
             (void)e;
         }
     }
@@ -851,7 +851,7 @@ sal_uLong UCBStorageStream_Impl::ReadSourceWriteTemporary( sal_uLong aLength )
         }
         catch( const Exception & e )
         {
-            OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+            OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
             (void)e;
         }
     }
@@ -905,7 +905,7 @@ sal_uLong UCBStorageStream_Impl::GetData( void* pData, sal_uLong nSize )
         }
         catch (const Exception &e)
         {
-            OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+            OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
             (void)e;
         }
 
@@ -1107,7 +1107,7 @@ sal_Int16 UCBStorageStream_Impl::Commit()
                 aArg.Data = xStream;
                 aArg.ReplaceExisting = sal_True;
                 aAny <<= aArg;
-                m_pContent->executeCommand( ::rtl::OUString("insert"), aAny );
+                m_pContent->executeCommand( OUString("insert"), aAny );
 
                 // wrapper now controls lifetime of temporary file
                 m_aTempURL.Erase();
@@ -1250,7 +1250,7 @@ void UCBStorageStream_Impl::PrepareCachedForReopen( StreamMode nMode )
     }
 }
 
-UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress )
+UCBStorageStream::UCBStorageStream( const String& rName, StreamMode nMode, sal_Bool bDirect, const OString* pKey, sal_Bool bRepair, Reference< XProgressHandler > xProgress )
 {
     // pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
     // to class UCBStorageStream !
@@ -1423,7 +1423,7 @@ sal_Bool UCBStorageStream::SetProperty( const String& rName, const ::com::sun::s
 
     if ( rName.CompareToAscii("MediaType") == COMPARE_EQUAL )
     {
-        ::rtl::OUString aTmp;
+        OUString aTmp;
         rValue >>= aTmp;
         pImp->m_aContentType = aTmp;
     }
@@ -1587,7 +1587,7 @@ UCBStorage_Impl::UCBStorage_Impl( const String& rName, StreamMode nMode, UCBStor
     if ( m_bIsRoot )
     {
         // create the special package URL for the package content
-        String aTemp = rtl::OUString("vnd.sun.star.pkg://");
+        String aTemp = OUString("vnd.sun.star.pkg://");
         aTemp += String(INetURLObject::encode( aName, INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL ));
         m_aURL = aTemp;
 
@@ -1632,7 +1632,7 @@ UCBStorage_Impl::UCBStorage_Impl( SvStream& rStream, UCBStorage* pStorage, sal_B
     // UCBStorages work on a content, so a temporary file for a content must be created, even if the stream is only
     // accessed readonly
     // the root storage opens the package; create the special package URL for the package content
-    String aTemp = rtl::OUString("vnd.sun.star.pkg://");
+    String aTemp = OUString("vnd.sun.star.pkg://");
     aTemp += String(INetURLObject::encode( m_pTempFile->GetURL(), INetURLObject::PART_AUTHORITY, '%', INetURLObject::ENCODE_ALL ));
     m_aURL = aTemp;
 
@@ -1671,7 +1671,7 @@ void UCBStorage_Impl::Init()
     {
         // Hack! Avoid access to the manifest file until mediatype is not available in the first segment of a
         // disk spanned file
-        m_aContentType = m_aOriginalContentType = ::rtl::OUString( "application/vnd.sun.xml.impress" );
+        m_aContentType = m_aOriginalContentType = OUString( "application/vnd.sun.xml.impress" );
     }
     else if ( m_pContent )
     {
@@ -1719,8 +1719,8 @@ void UCBStorage_Impl::Init()
         {
             // get the manifest information from the package
             try {
-                Any aAny = m_pContent->getPropertyValue( ::rtl::OUString("MediaType") );
-                rtl::OUString aTmp;
+                Any aAny = m_pContent->getPropertyValue( OUString("MediaType") );
+                OUString aTmp;
                 if ( ( aAny >>= aTmp ) && !aTmp.isEmpty() )
                     m_aContentType = m_aOriginalContentType = aTmp;
             }
@@ -1758,13 +1758,13 @@ void UCBStorage_Impl::CreateContent()
         // create content; where to put StreamMode ?! ( already done when opening the file of the package ? )
         Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
 
-        ::rtl::OUString aTemp( m_aURL );
+        OUString aTemp( m_aURL );
 
         if ( m_bRepairPackage )
         {
             xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
                                                      m_xProgressHandler );
-            aTemp += rtl::OUString("?repairpackage");
+            aTemp += OUString("?repairpackage");
         }
 
         m_pContent = new ::ucbhelper::Content( aTemp, xComEnv, comphelper::getProcessComponentContext() );
@@ -1789,12 +1789,12 @@ void UCBStorage_Impl::ReadContent()
     m_bListCreated = sal_True;
 
     // create cursor for access to children
-    Sequence< ::rtl::OUString > aProps(4);
-    ::rtl::OUString* pProps = aProps.getArray();
-    pProps[0] = ::rtl::OUString("Title");
-    pProps[1] = ::rtl::OUString("IsFolder");
-    pProps[2] = ::rtl::OUString("MediaType");
-    pProps[3] = ::rtl::OUString("Size");
+    Sequence< OUString > aProps(4);
+    OUString* pProps = aProps.getArray();
+    pProps[0] = OUString("Title");
+    pProps[1] = OUString("IsFolder");
+    pProps[2] = OUString("MediaType");
+    pProps[3] = OUString("Size");
     ::ucbhelper::ResultSetInclude eInclude = ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
 
     try
@@ -1811,8 +1811,8 @@ void UCBStorage_Impl::ReadContent()
             while ( xResultSet->next() )
             {
                 // insert all into the children list
-                ::rtl::OUString aTitle( xRow->getString(1) );
-                ::rtl::OUString aContentType;
+                OUString aTitle( xRow->getString(1) );
+                OUString aContentType;
                 if ( m_bIsLinked )
                 {
                     // unpacked storages have to deal with the meta-inf folder by themselves
@@ -1854,8 +1854,8 @@ void UCBStorage_Impl::ReadContent()
 
                     ::ucbhelper::Content aContent( aName, xComEnv, comphelper::getProcessComponentContext() );
 
-                    ::rtl::OUString aMediaType;
-                    Any aAny = aContent.getPropertyValue( ::rtl::OUString("MediaType") );
+                    OUString aMediaType;
+                    Any aAny = aContent.getPropertyValue( OUString("MediaType") );
                     if ( ( aAny >>= aMediaType ) && ( aMediaType.compareToAscii("application/vnd.sun.star.oleobject") == 0 ) )
                         pElement->m_bIsStorage = sal_True;
                     else if ( aMediaType.isEmpty() )
@@ -1928,20 +1928,20 @@ sal_Int32 UCBStorage_Impl::GetObjectCount()
     return nCount;
 }
 
-::rtl::OUString Find_Impl( const Sequence < Sequence < PropertyValue > >& rSequence, const ::rtl::OUString& rPath )
+OUString Find_Impl( const Sequence < Sequence < PropertyValue > >& rSequence, const OUString& rPath )
 {
     sal_Bool bFound = sal_False;
     for ( sal_Int32 nSeqs=0; nSeqs<rSequence.getLength(); nSeqs++ )
     {
         const Sequence < PropertyValue >& rMyProps = rSequence[nSeqs];
-        ::rtl::OUString aType;
+        OUString aType;
 
         for ( sal_Int32 nProps=0; nProps<rMyProps.getLength(); nProps++ )
         {
             const PropertyValue& rAny = rMyProps[nProps];
             if ( rAny.Name == "FullPath" )
             {
-                rtl::OUString aTmp;
+                OUString aTmp;
                 if ( ( rAny.Value >>= aTmp ) && aTmp == rPath )
                     bFound = sal_True;
                 if ( !aType.isEmpty() )
@@ -1958,7 +1958,7 @@ sal_Int32 UCBStorage_Impl::GetObjectCount()
             return aType;
     }
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 void UCBStorage_Impl::SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const String& rPath )
@@ -2015,10 +2015,10 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
     if ( !m_bIsRoot )
         aPath += m_aName;
     aPath += '/';
-    aProps[0].Name = ::rtl::OUString("MediaType");
-    aProps[0].Value <<= (::rtl::OUString ) m_aContentType;
-    aProps[1].Name = ::rtl::OUString("FullPath");
-    aProps[1].Value <<= (::rtl::OUString ) aPath;
+    aProps[0].Name = OUString("MediaType");
+    aProps[0].Value <<= (OUString ) m_aContentType;
+    aProps[1].Name = OUString("FullPath");
+    aProps[1].Value <<= (OUString ) aPath;
     rSequence[ nProps++ ] = aProps;
 
     if ( m_bIsRoot )
@@ -2038,10 +2038,10 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert
             // properties of streams
             String aElementPath( aPath );
             aElementPath += pElement->m_aName;
-            aProps[0].Name = ::rtl::OUString("MediaType");
-            aProps[0].Value <<= (::rtl::OUString ) pElement->GetContentType();
-            aProps[1].Name = ::rtl::OUString("FullPath");
-            aProps[1].Value <<= (::rtl::OUString ) aElementPath;
+            aProps[0].Name = OUString("MediaType");
+            aProps[0].Value <<= (OUString ) pElement->GetContentType();
+            aProps[1].Name = OUString("FullPath");
+            aProps[1].Value <<= (OUString ) aElementPath;
             rSequence[ nProps++ ] = aProps;
         }
     }
@@ -2085,12 +2085,12 @@ sal_Bool UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent )
                 if ( rProps[ 0 ].Name != "Title" )
                     continue;
 
-                Sequence < ::rtl::OUString > aNames(1);
-                ::rtl::OUString* pNames = aNames.getArray();
-                pNames[0] = ::rtl::OUString(  "Title"  );
+                Sequence < OUString > aNames(1);
+                OUString* pNames = aNames.getArray();
+                pNames[0] = OUString(  "Title"  );
                 Sequence < Any > aValues(1);
                 Any* pValues = aValues.getArray();
-                pValues[0] = makeAny( ::rtl::OUString( m_aName ) );
+                pValues[0] = makeAny( OUString( m_aName ) );
 
                 Content aNewFolder;
                 if ( !pContent->insertNewContent( rCurr.Type, aNames, aValues, aNewFolder ) )
@@ -2157,7 +2157,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                         // first remove all open stream handles
                         if( !pElement->m_xStream.Is() || pElement->m_xStream->Clear() )
                         {
-                            pContent->executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
+                            pContent->executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) );
                             nRet = COMMIT_RESULT_SUCCESS;
                         }
                         else
@@ -2188,10 +2188,10 @@ sal_Int16 UCBStorage_Impl::Commit()
                         if ( pElement->m_xStream->m_bIsOLEStorage )
                         {
                             // OLE storage should be stored encrytped, if the storage uses encryption
-                            pElement->m_xStream->m_aContentType = rtl::OUString("application/vnd.sun.star.oleobject");
+                            pElement->m_xStream->m_aContentType = OUString("application/vnd.sun.star.oleobject");
                             Any aValue;
                             aValue <<= (sal_Bool) sal_True;
-                            pElement->m_xStream->m_pContent->setPropertyValue(rtl::OUString("Encrypted"), aValue );
+                            pElement->m_xStream->m_pContent->setPropertyValue(OUString("Encrypted"), aValue );
                         }
 
                         pContent = pElement->GetContent();
@@ -2202,8 +2202,8 @@ sal_Int16 UCBStorage_Impl::Commit()
                         // name ( title ) of the element was changed
                         nLocalRet = COMMIT_RESULT_SUCCESS;
                         Any aAny;
-                        aAny <<= (rtl::OUString) pElement->m_aName;
-                        pContent->setPropertyValue( ::rtl::OUString("Title"), aAny );
+                        aAny <<= (OUString) pElement->m_aName;
+                        pContent->setPropertyValue( OUString("Title"), aAny );
                     }
 
                     if ( pElement->IsLoaded() && pElement->GetContentType() != pElement->GetOriginalContentType() )
@@ -2211,8 +2211,8 @@ sal_Int16 UCBStorage_Impl::Commit()
                         // mediatype of the element was changed
                         nLocalRet = COMMIT_RESULT_SUCCESS;
                         Any aAny;
-                        aAny <<= (rtl::OUString) pElement->GetContentType();
-                        pContent->setPropertyValue( ::rtl::OUString("MediaType"), aAny );
+                        aAny <<= (OUString) pElement->GetContentType();
+                        pContent->setPropertyValue( OUString("MediaType"), aAny );
                     }
 
                     if ( nLocalRet != COMMIT_RESULT_NOTHING_TO_DO )
@@ -2262,15 +2262,15 @@ sal_Int16 UCBStorage_Impl::Commit()
                     // commit the media type to the JAR file
                     // clipboard format and ClassId will be retrieved from the media type when the file is loaded again
                     Any aType;
-                    aType <<= (rtl::OUString) m_aContentType;
-                    m_pContent->setPropertyValue( ::rtl::OUString("MediaType"), aType );
+                    aType <<= (OUString) m_aContentType;
+                    m_pContent->setPropertyValue( OUString("MediaType"), aType );
 
                     if (  m_bIsLinked )
                     {
                         // write a manifest file
                         // first create a subfolder "META-inf"
                         Content aNewSubFolder;
-                        sal_Bool bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, rtl::OUString("META-INF"), aNewSubFolder );
+                        sal_Bool bRet = ::utl::UCBContentHelper::MakeFolder( *m_pContent, OUString("META-INF"), aNewSubFolder );
                         if ( bRet )
                         {
                             // create a stream to write the manifest file - use a temp file
@@ -2297,7 +2297,7 @@ sal_Int16 UCBStorage_Impl::Commit()
                             xWriter = NULL;
                             xOutputStream = NULL;
                             DELETEZ( pTempFile );
-                            aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, ::rtl::OUString("manifest.xml"), NameClash::OVERWRITE );
+                            aNewSubFolder.transferContent( aSource, InsertOperation_MOVE, OUString("manifest.xml"), NameClash::OVERWRITE );
                         }
                     }
                     else
@@ -2308,7 +2308,7 @@ sal_Int16 UCBStorage_Impl::Commit()
 #endif
                         // force writing
                         Any aAny;
-                        m_pContent->executeCommand( ::rtl::OUString("flush"), aAny );
+                        m_pContent->executeCommand( OUString("flush"), aAny );
                         if ( m_pSource != 0 )
                         {
                             SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( m_pTempFile->GetURL(), STREAM_STD_READ );
@@ -2690,7 +2690,7 @@ sal_Bool UCBStorage::Revert()
     return pImp->Revert();
 }
 
-BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey )
+BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nMode, sal_Bool bDirect, const OString* pKey )
 {
     if( !rEleName.Len() )
         return NULL;
@@ -2736,7 +2736,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM
             {
                 // check if stream is opened with the same keyword as before
                 // if not, generate a new stream because it could be encrypted vs. decrypted!
-                rtl::OString aKey;
+                OString aKey;
                 if ( pKey )
                     aKey = *pKey;
                 if ( pElement->m_xStream->m_aKey == aKey )
@@ -2759,7 +2759,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM
     return NULL;
 }
 
-UCBStorageStream_Impl* UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode nMode, sal_Bool bDirect, const rtl::OString* pKey )
+UCBStorageStream_Impl* UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode nMode, sal_Bool bDirect, const OString* pKey )
 {
     String aName( m_aURL );
     aName += '/';
@@ -3165,10 +3165,10 @@ String UCBStorage::GetLinkedFile( SvStream &rStream )
     rStream >> nBytes;
     if( nBytes == 0x04034b50 )
     {
-        rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
+        OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream);
         if (aTmp.match("ContentURL="))
         {
-            aString = rtl::OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8);
+            aString = OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8);
         }
     }
 
@@ -3194,7 +3194,7 @@ String UCBStorage::CreateLinkFile( const String& rName )
     // assemble a new folder name in the destination folder
     INetURLObject aObj( rName );
     String aTmpName = aObj.GetName();
-    String aTitle = rtl::OUString( "content." );
+    String aTitle = OUString( "content." );
     aTitle += aTmpName;
 
     // create a folder and store its URL
@@ -3234,7 +3234,7 @@ String UCBStorage::CreateLinkFile( const String& rName )
         String aURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
 
         // store it as key/value pair
-        String aLink = rtl::OUString("ContentURL=");
+        String aLink = OUString("ContentURL=");
         aLink += aURL;
         write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(*pStream, aLink, RTL_TEXTENCODING_UTF8);
         pStream->Flush();
diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx
index 5031b143e20d..ad88bc0da3ff 100644
--- a/sot/source/unoolestorage/register.cxx
+++ b/sot/source/unoolestorage/register.cxx
@@ -34,7 +34,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sot_component_getFactory(
 {
     void * pRet = 0;
 
-    ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
+    OUString aImplName( OUString::createFromAscii( pImplName ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
     if ( pServiceManager && aImplName.equals( OLESimpleStorage::impl_staticGetImplementationName() ) )
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 85ec2b361623..3141915ab9be 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -72,17 +72,17 @@ OLESimpleStorage::~OLESimpleStorage()
 }
 
 //-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames()
 {
-    uno::Sequence< ::rtl::OUString > aRet(1);
-    aRet[0] = ::rtl::OUString("com.sun.star.embed.OLESimpleStorage");
+    uno::Sequence< OUString > aRet(1);
+    aRet[0] = OUString("com.sun.star.embed.OLESimpleStorage");
     return aRet;
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OLESimpleStorage::impl_staticGetImplementationName()
+OUString SAL_CALL OLESimpleStorage::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString("com.sun.star.comp.embed.OLESimpleStorage");
+    return OUString("com.sun.star.comp.embed.OLESimpleStorage");
 }
 
 //-------------------------------------------------------------------------
@@ -119,7 +119,7 @@ void OLESimpleStorage::UpdateOriginal_Impl()
 }
 
 //-------------------------------------------------------------------------
-void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< io::XInputStream >& xInputStream )
+void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, OUString aName, const uno::Reference< io::XInputStream >& xInputStream )
     throw ( uno::Exception )
 {
     if ( !pStorage || aName.isEmpty() || !xInputStream.is() )
@@ -164,7 +164,7 @@ void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, :
 }
 
 //-------------------------------------------------------------------------
-void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess )
+void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess )
     throw ( uno::Exception )
 {
     if ( !pStorage || aName.isEmpty() || !xNameAccess.is() )
@@ -184,7 +184,7 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::
 
     try
     {
-        uno::Sequence< ::rtl::OUString > aElements = xNameAccess->getElementNames();
+        uno::Sequence< OUString > aElements = xNameAccess->getElementNames();
         for ( sal_Int32 nInd = 0; nInd < aElements.getLength(); nInd++ )
         {
             uno::Reference< io::XInputStream > xInputStream;
@@ -315,7 +315,7 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
 //____________________________________________________________________________________________________
 
 // --------------------------------------------------------------------------------
-void SAL_CALL OLESimpleStorage::insertByName( const ::rtl::OUString& aName, const uno::Any& aElement )
+void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::Any& aElement )
         throw ( lang::IllegalArgumentException,
                 container::ElementExistException,
                 lang::WrappedTargetException,
@@ -360,14 +360,14 @@ void SAL_CALL OLESimpleStorage::insertByName( const ::rtl::OUString& aName, cons
     }
     catch( const uno::Exception& e )
     {
-        throw lang::WrappedTargetException( ::rtl::OUString(  "Insert has failed!"  ),
+        throw lang::WrappedTargetException( OUString(  "Insert has failed!"  ),
                                             uno::Reference< uno::XInterface >(),
                                             uno::makeAny( e ) );
     }
 }
 
 // --------------------------------------------------------------------------------
-void SAL_CALL OLESimpleStorage::removeByName( const ::rtl::OUString& aName )
+void SAL_CALL OLESimpleStorage::removeByName( const OUString& aName )
         throw ( container::NoSuchElementException,
                 lang::WrappedTargetException,
                 uno::RuntimeException)
@@ -396,7 +396,7 @@ void SAL_CALL OLESimpleStorage::removeByName( const ::rtl::OUString& aName )
 }
 
 // --------------------------------------------------------------------------------
-void SAL_CALL OLESimpleStorage::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement )
+void SAL_CALL OLESimpleStorage::replaceByName( const OUString& aName, const uno::Any& aElement )
         throw ( lang::IllegalArgumentException,
                 container::NoSuchElementException,
                 lang::WrappedTargetException,
@@ -417,14 +417,14 @@ void SAL_CALL OLESimpleStorage::replaceByName( const ::rtl::OUString& aName, con
     {
            uno::Any aCaught( ::cppu::getCaughtException() );
 
-        throw lang::WrappedTargetException( ::rtl::OUString("Can't copy raw stream"),
+        throw lang::WrappedTargetException( OUString("Can't copy raw stream"),
                                             uno::Reference< uno::XInterface >(),
                                             aCaught );
     }
 }
 
 // --------------------------------------------------------------------------------
-uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
+uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName )
         throw ( container::NoSuchElementException,
                 lang::WrappedTargetException,
                 uno::RuntimeException )
@@ -479,7 +479,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
 
         uno::Reference< container::XNameContainer > xResultNameContainer(
             m_xFactory->createInstanceWithArguments(
-                    ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"),
+                    OUString("com.sun.star.embed.OLESimpleStorage"),
                     aArgs ),
             uno::UNO_QUERY_THROW );
 
@@ -537,7 +537,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const ::rtl::OUString& aName )
 }
 
 // --------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames()
+uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getElementNames()
         throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -557,7 +557,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames()
         throw uno::RuntimeException(); // TODO:
     }
 
-    uno::Sequence< ::rtl::OUString > aSeq( aList.size() );
+    uno::Sequence< OUString > aSeq( aList.size() );
     for ( sal_uInt32 nInd = 0; nInd < aList.size(); nInd++ )
         aSeq[nInd] = aList[nInd].GetName();
 
@@ -565,7 +565,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getElementNames()
 }
 
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL OLESimpleStorage::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL OLESimpleStorage::hasByName( const OUString& aName )
         throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -755,14 +755,14 @@ uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID()
     return m_pStorage->GetClassName().GetByteSequence();
 }
 
-::rtl::OUString SAL_CALL OLESimpleStorage::getClassName()
+OUString SAL_CALL OLESimpleStorage::getClassName()
     throw ( uno::RuntimeException )
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
 void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /*aClassID*/,
-                            const ::rtl::OUString& /*sClassName*/ )
+                            const OUString& /*sClassName*/ )
         throw ( lang::NoSupportException,
                 uno::RuntimeException )
 {
@@ -774,17 +774,17 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /
 //____________________________________________________________________________________________________
 
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OLESimpleStorage::getImplementationName()
+OUString SAL_CALL OLESimpleStorage::getImplementationName()
         throw ( uno::RuntimeException )
 {
     return impl_staticGetImplementationName();
 }
 
 // --------------------------------------------------------------------------------
-::sal_Bool SAL_CALL OLESimpleStorage::supportsService( const ::rtl::OUString& ServiceName )
+::sal_Bool SAL_CALL OLESimpleStorage::supportsService( const OUString& ServiceName )
         throw ( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
+    uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
 
     for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
         if ( ServiceName.compareTo( aSeq[nInd] ) == 0 )
@@ -794,7 +794,7 @@ void SAL_CALL OLESimpleStorage::setClassInfo( const uno::Sequence< sal_Int8 >& /
 }
 
 // --------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OLESimpleStorage::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getSupportedServiceNames()
         throw ( uno::RuntimeException )
 {
     return impl_staticGetSupportedServiceNames();
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 0759ae3651fa..a2872778fb39 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -59,10 +59,10 @@ class OLESimpleStorage  : public ::cppu::WeakImplHelper3
 
     void UpdateOriginal_Impl();
 
-    static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream )
+    static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream )
     throw ( ::com::sun::star::uno::Exception );
 
-    static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, ::rtl::OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xNameAccess )
+    static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, OUString aName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xNameAccess )
     throw ( ::com::sun::star::uno::Exception );
 
 public:
@@ -71,8 +71,8 @@ public:
 
     virtual ~OLESimpleStorage();
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames();
-    static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+    static OUString SAL_CALL impl_staticGetImplementationName();
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         impl_staticCreateSelfInstance(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
@@ -90,32 +90,32 @@ public:
     //  XNameContainer
     //____________________________________________________________________________________________________
 
-    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw ( ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::ElementExistException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+    virtual void SAL_CALL removeByName( const OUString& Name )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw ( ::com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
         throw ( ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
         throw ( ::com::sun::star::uno::RuntimeException );
 
     virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
@@ -160,11 +160,11 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    virtual ::rtl::OUString SAL_CALL getClassName()
+    virtual OUString SAL_CALL getClassName()
         throw ( ::com::sun::star::uno::RuntimeException );
 
     virtual void SAL_CALL setClassInfo( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID,
-                                        const ::rtl::OUString& sClassName )
+                                        const OUString& sClassName )
         throw ( ::com::sun::star::lang::NoSupportException,
                 ::com::sun::star::uno::RuntimeException );
 
@@ -172,13 +172,13 @@ public:
     //  XServiceInfo
     //____________________________________________________________________________________________________
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw ( ::com::sun::star::uno::RuntimeException );
 
 };