mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

10 files changed, 157 insertions, 157 deletions

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index f3c0692af630..e5a7511d11e7 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -66,7 +66,7 @@
 
 using namespace ::com::sun::star;
 
-extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
+extern OUString  getFilterNameFromGUID_Impl( GUID* );
 
 // add mutex locking ???
 
@@ -120,21 +120,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
         aAny <<= uno::Reference<uno::XInterface>(
             m_xDocument, uno::UNO_QUERY);
         aSeq[0] = beans::PropertyValue(
-            rtl::OUString("Model"),
+            OUString("Model"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         aAny <<= sal_False;
         aSeq[1] = beans::PropertyValue(
-            rtl::OUString("ReadOnly"),
+            OUString("ReadOnly"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         aAny <<= (sal_Bool) sal_True;
         aSeq[2] = beans::PropertyValue(
-            rtl::OUString("NoAutoSave"),
+            OUString("NoAutoSave"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
@@ -144,7 +144,7 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
             aSeq.realloc( ++nLen );
             aAny <<= (sal_Int16) 3;
             aSeq[nLen-1] = beans::PropertyValue(
-                rtl::OUString("PluginMode"),
+                OUString("PluginMode"),
                 -1,
                 aAny,
                 beans::PropertyState_DIRECT_VALUE);
@@ -153,21 +153,21 @@ void DocumentHolder::LoadDocInFrame( sal_Bool bPluginMode )
         aSeq.realloc( nLen+=2 );
         aAny <<= xHandler;
         aSeq[nLen-2] = beans::PropertyValue(
-            rtl::OUString("InteractionHandler"),
+            OUString("InteractionHandler"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         aAny <<= m_nMacroExecMode;
         aSeq[nLen-1] = beans::PropertyValue(
-            rtl::OUString("MacroExecutionMode"),
+            OUString("MacroExecutionMode"),
             -1,
             aAny,
             beans::PropertyState_DIRECT_VALUE);
 
         xComponentLoader->loadComponentFromURL(
-            rtl::OUString("private:object"),
-            rtl::OUString("_self"),
+            OUString("private:object"),
+            OUString("_self"),
             0,
             aSeq);
 
@@ -348,7 +348,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             m_xFrame->activate();
         else {
             // create frame and initialize it with with the created window
-            static const ::rtl::OUString aFrameServiceName( "com.sun.star.frame.Frame" );
+            static const OUString aFrameServiceName( "com.sun.star.frame.Frame" );
             m_xFrame = uno::Reference<frame::XFrame>(
                 m_xFactory->createInstance(aFrameServiceName),
                 uno::UNO_QUERY);
@@ -367,7 +367,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             if( xPS.is() )
             {
                 aAny = xPS->getPropertyValue(
-                    rtl::OUString("LayoutManager"));
+                    OUString("LayoutManager"));
                 aAny >>= m_xLayoutManager;
             }
 
@@ -384,7 +384,7 @@ HRESULT DocumentHolder::InPlaceActivate(
             if(m_xLayoutManager.is()) {
                 uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl(
                     m_xLayoutManager->getElement(
-                        rtl::OUString(
+                        OUString(
                             "private:resource/menubar/menubar")));
                 OSL_ENSURE(xUIEl.is(),"no menubar");
                 uno::Reference<awt::XSystemDependentMenuPeer> xSDMP(
@@ -396,7 +396,7 @@ HRESULT DocumentHolder::InPlaceActivate(
                 if( aAny >>= tmp )
                     m_nMenuHandle = HMENU(tmp);
                 m_xLayoutManager->hideElement(
-                    rtl::OUString(
+                    OUString(
                             "private:resource/menubar/menubar" ));
             }
         }
@@ -735,9 +735,9 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s
     {
         // set the document mode to embedded
         uno::Sequence< beans::PropertyValue > aSeq(1);
-        aSeq[0].Name = ::rtl::OUString( "SetEmbedded" );
+        aSeq[0].Name = OUString( "SetEmbedded" );
         aSeq[0].Value <<= sal_True;
-        m_xDocument->attachResource(::rtl::OUString(),aSeq);
+        m_xDocument->attachResource(OUString(),aSeq);
     }
 }
 
@@ -796,7 +796,7 @@ uno::Reference< frame::XFrame > DocumentHolder::DocumentFrame()
         // this is so only for outplace activation
         if( xFrame.is() )
             m_xFrame = xFrame->findFrame(
-                rtl::OUString("_blank"),0);
+                OUString("_blank"),0);
 
         uno::Reference< util::XCloseBroadcaster > xBroadcaster(
             m_xFrame, uno::UNO_QUERY );
@@ -872,11 +872,11 @@ void DocumentHolder::show()
             if ( xProps.is() )
             {
                 uno::Reference< frame::XLayoutManager > xLayoutManager;
-                xProps->getPropertyValue( rtl::OUString( "LayoutManager" ) ) >>= xLayoutManager;
+                xProps->getPropertyValue( OUString( "LayoutManager" ) ) >>= xLayoutManager;
                 uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY );
                 if ( xLMProps.is() )
                 {
-                    xLMProps->setPropertyValue( ::rtl::OUString( "MenuBarCloser" ),
+                    xLMProps->setPropertyValue( OUString( "MenuBarCloser" ),
                                                 uno::makeAny( uno::Reference< frame::XStatusListener >() ) );
                 }
             }
@@ -957,13 +957,13 @@ void DocumentHolder::resizeWin( const SIZEL& rNewSize )
     }
 }
 
-void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
+void DocumentHolder::setTitle(const OUString& aDocumentName)
 {
     if(m_xFrame.is())
     {
         if(m_aFilterName.getLength() == 0)
         {
-            rtl::OUString aFilterName;
+            OUString aFilterName;
             uno::Sequence<beans::PropertyValue> aSeq;
             if(m_xDocument.is())
             {
@@ -972,7 +972,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
                 for(sal_Int32 j = 0; j < aSeq.getLength(); ++j)
                 {
                     if(aSeq[j].Name ==
-                       rtl::OUString("FilterName"))
+                       OUString("FilterName"))
                     {
                         aSeq[j].Value >>= aFilterName;
                         break;
@@ -984,7 +984,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
             {
                 uno::Reference<container::XNameAccess> xNameAccess(
                     m_xFactory->createInstance(
-                        rtl::OUString(
+                        OUString(
                             "com.sun.star.document.FilterFactory")),
                     uno::UNO_QUERY);
                 try {
@@ -993,7 +993,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
                     {
                         for(sal_Int32 j = 0; j < aSeq.getLength(); ++j)
                             if(aSeq[j].Name ==
-                               rtl::OUString("UIName"))
+                               OUString("UIName"))
                             {
                                 aSeq[j].Value >>= m_aFilterName;
                                 break;
@@ -1013,14 +1013,14 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
             uno::Any aAny;
             static const sal_Unicode u[] = { ' ','(',0 };
             static const sal_Unicode c[] = { ')',0 };
-            rtl::OUString aTotalName(m_aFilterName);
-            aTotalName += rtl::OUString(u);
+            OUString aTotalName(m_aFilterName);
+            aTotalName += OUString(u);
             aTotalName += aDocumentName;
-            aTotalName += rtl::OUString(c);
+            aTotalName += OUString(c);
             aAny <<= aTotalName;
             try {
                 xPropSet->setPropertyValue(
-                    rtl::OUString("Title"),
+                    OUString("Title"),
                     aAny);
             }
             catch( const uno::Exception& ) {
@@ -1047,7 +1047,7 @@ void DocumentHolder::setTitle(const rtl::OUString& aDocumentName)
 }
 
 
-void DocumentHolder::setContainerName(const rtl::OUString& aContainerName)
+void DocumentHolder::setContainerName(const OUString& aContainerName)
 {
     m_aContainerName = aContainerName;
 }
@@ -1066,7 +1066,7 @@ IDispatch* DocumentHolder::GetIDispatch()
 {
     if ( !m_pIDispatch && m_xDocument.is() )
     {
-        const ::rtl::OUString aServiceName (
+        const OUString aServiceName (
                 "com.sun.star.bridge.OleBridgeSupplier2" );
         uno::Reference< bridge::XBridgeSupplier2 > xSupplier(
             m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index d76d3aa3bc65..464dd5b519c7 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -47,15 +47,15 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
 
         if ( isEnhMeta )
         {
-            aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+            aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM(
                                                 "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) );
-            aFlavor.HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" );
+            aFlavor.HumanPresentableName = OUString( "Enhanced Windows MetaFile" );
         }
         else
         {
-            aFlavor.MimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+            aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM(
                                                 "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) );
-            aFlavor.HumanPresentableName = ::rtl::OUString( "Windows GDIMetaFile" );
+            aFlavor.HumanPresentableName = OUString( "Windows GDIMetaFile" );
         }
 
         aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 );
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index 989a22113b24..a0d2cf515209 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -26,7 +26,7 @@
 using namespace ::com::sun::star;
 
 
-extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
+extern OUString  getFilterNameFromGUID_Impl( GUID* );
 
 //-------------------------------------------------------------------------------
 // IOleObject
@@ -50,10 +50,10 @@ STDMETHODIMP EmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLES
     if ( !m_aFileName.getLength() )
     {
         m_pDocHolder->setTitle(
-            rtl::OUString(
+            OUString(
                 (sal_Unicode*)szContainerObj));
         m_pDocHolder->setContainerName(
-            rtl::OUString(
+            OUString(
                 (sal_Unicode*)szContainerApp));
     }
 
@@ -425,7 +425,7 @@ HRESULT EmbedDocument_Impl::SaveObject()
     }
     else if ( m_aFileName.getLength() && IsDirty() == S_OK )
     {
-        ::rtl::OUString aPreservFileName = m_aFileName;
+        OUString aPreservFileName = m_aFileName;
 
         // in case of links the containers does not provide client site sometimes
         hr = Save( (LPCOLESTR)NULL, FALSE ); // triggers saving to the link location
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index becbe85f4d5b..c7ad57ffb527 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -54,14 +54,14 @@ const sal_Int32 nConstBufferSize = 32000;
 
 using namespace ::com::sun::star;
 
-extern ::rtl::OUString  getStorageTypeFromGUID_Impl( GUID* guid );
-extern ::rtl::OUString  getServiceNameFromGUID_Impl( GUID* );
-extern ::rtl::OUString  getFilterNameFromGUID_Impl( GUID* );
+extern OUString  getStorageTypeFromGUID_Impl( GUID* guid );
+extern OUString  getServiceNameFromGUID_Impl( GUID* );
+extern OUString  getFilterNameFromGUID_Impl( GUID* );
 // extern CLIPFORMAT        getClipFormatFromGUID_Impl( GUID* );
-::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid );
+OUString getTestFileURLFromGUID_Impl( GUID* guid );
 
-const ::rtl::OUString aOfficeEmbedStreamName( "package_stream" );
-const ::rtl::OUString aExtentStreamName( "properties_stream" );
+const OUString aOfficeEmbedStreamName( "package_stream" );
+const OUString aExtentStreamName( "properties_stream" );
 
 uno::Reference< io::XInputStream > createTempXInStreamFromIStream(
                                         uno::Reference< lang::XMultiServiceFactory > xFactory,
@@ -206,29 +206,29 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
     uno::Sequence< beans::PropertyValue > aArgs( 3 );
 
     sal_Int32 nInd = 0; // must not be bigger than the preset size
-    aArgs[nInd].Name = ::rtl::OUString( "FilterName" );
+    aArgs[nInd].Name = OUString( "FilterName" );
     aArgs[nInd++].Value <<= getFilterNameFromGUID_Impl( &m_guid );
 
     if ( xStream.is() )
     {
-        aArgs[nInd].Name = ::rtl::OUString( "InputStream" );
+        aArgs[nInd].Name = OUString( "InputStream" );
         aArgs[nInd++].Value <<= xStream;
-        aArgs[nInd].Name = ::rtl::OUString( "URL" );
-        aArgs[nInd++].Value <<= ::rtl::OUString( "private:stream" );
+        aArgs[nInd].Name = OUString( "URL" );
+        aArgs[nInd++].Value <<= OUString( "private:stream" );
     }
     else
     {
-        aArgs[nInd].Name = ::rtl::OUString( "URL" );
+        aArgs[nInd].Name = OUString( "URL" );
 
-        rtl::OUString sDocUrl;
+        OUString sDocUrl;
         if ( pFilePath )
         {
             uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::getComponentContext(m_xFactory)) );
             util::URL aURL;
 
-            aURL.Complete = ::rtl::OUString( reinterpret_cast<const sal_Unicode*>(pFilePath) );
+            aURL.Complete = OUString( reinterpret_cast<const sal_Unicode*>(pFilePath) );
 
-            if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) )
+            if ( aTransformer->parseSmart( aURL, OUString() ) )
                 sDocUrl = aURL.Complete;
         }
 
@@ -237,7 +237,7 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForLoading_Imp
 
     aArgs.realloc( nInd );
 
-    // aArgs[].Name = ::rtl::OUString( "ReadOnly" );
+    // aArgs[].Name = OUString( "ReadOnly" );
     // aArgs[].Value <<= sal_False; //( ( nStreamMode & ( STGM_READWRITE | STGM_WRITE ) ) ? sal_True : sal_False );
 
     return aArgs;
@@ -247,12 +247,12 @@ uno::Sequence< beans::PropertyValue > EmbedDocument_Impl::fillArgsForStoring_Imp
 {
     uno::Sequence< beans::PropertyValue > aArgs( xStream.is() ? 2 : 1 );
 
-    aArgs[0].Name = ::rtl::OUString( "FilterName" );
+    aArgs[0].Name = OUString( "FilterName" );
     aArgs[0].Value <<= getFilterNameFromGUID_Impl( &m_guid );
 
     if ( xStream.is() )
     {
-        aArgs[1].Name = ::rtl::OUString( "OutputStream" );
+        aArgs[1].Name = OUString( "OutputStream" );
         aArgs[1].Value <<= xStream;
     }
 
@@ -427,7 +427,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
 
                 if ( hr == S_OK )
                 {
-                    ::rtl::OUString aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ???
+                    OUString aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ???
                     CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
                     hr = WriteFmtUserTypeStg( pStg,
                                             cf,                         // ???
@@ -631,7 +631,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
     {
         try
         {
-            xStorable->storeToURL( ::rtl::OUString( "private:stream" ),
+            xStorable->storeToURL( OUString( "private:stream" ),
                                         fillArgsForStoring_Impl( xTempOut ) );
             hr = copyXTempOutToIStream( xTempOut, pTargetStream );
             if ( SUCCEEDED( hr ) )
@@ -759,7 +759,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
 
     if ( FAILED( hr ) || !m_pMasterStorage ) return E_FAIL;
 
-    ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
+    OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
     CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
     hr = WriteFmtUserTypeStg( m_pMasterStorage,
                             cf,                         // ???
@@ -801,7 +801,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
                                                             pszFileName ) );
                 hr = S_OK;
 
-                m_aFileName = ::rtl::OUString( reinterpret_cast<const sal_Unicode*>(pszFileName) );
+                m_aFileName = OUString( reinterpret_cast<const sal_Unicode*>(pszFileName) );
             }
             catch( const uno::Exception& )
             {
@@ -810,7 +810,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
 
         if ( hr == S_OK )
         {
-            ::rtl::OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
+            OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
             CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" );
             hr = WriteFmtUserTypeStg( m_pMasterStorage,
                                     cf,                         // ???
@@ -877,11 +877,11 @@ STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
         else
         {
             util::URL aURL;
-            aURL.Complete = ::rtl::OUString( reinterpret_cast<const sal_Unicode*>( pszFileName ) );
+            aURL.Complete = OUString( reinterpret_cast<const sal_Unicode*>( pszFileName ) );
 
             uno::Reference< util::XURLTransformer > aTransformer( util::URLTransformer::create(comphelper::getComponentContext(m_xFactory)) );
 
-            if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) && aURL.Complete.getLength() )
+            if ( aTransformer->parseSmart( aURL, OUString() ) && aURL.Complete.getLength() )
             {
                 if ( fRemember )
                 {
@@ -905,7 +905,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
 STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
 {
     // the different file name would mean error here
-    m_aFileName = ::rtl::OUString( reinterpret_cast<const sal_Unicode*>(pszFileName) );
+    m_aFileName = OUString( reinterpret_cast<const sal_Unicode*>(pszFileName) );
     return S_OK;
 }
 
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index 6827d650db4e..1e445df1694c 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -24,144 +24,144 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
-::rtl::OUString getStorageTypeFromGUID_Impl( GUID* guid )
+OUString getStorageTypeFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( "soffice.StarWriterDocument.6" );
+        return OUString( "soffice.StarWriterDocument.6" );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( "LibreOffice.WriterDocument.1" );
+        return OUString( "LibreOffice.WriterDocument.1" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( "soffice.StarCalcDocument.6" );
+        return OUString( "soffice.StarCalcDocument.6" );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( "LibreOffice.CalcDocument.1" );
+        return OUString( "LibreOffice.CalcDocument.1" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( "soffice.StarDrawDocument.6" );
+        return OUString( "soffice.StarDrawDocument.6" );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( "LibreOffice.DrawDocument.1" );
+        return OUString( "LibreOffice.DrawDocument.1" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( "soffice.StarImpressDocument.6" );
+        return OUString( "soffice.StarImpressDocument.6" );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( "LibreOffice.ImpressDocument.1" );
+        return OUString( "LibreOffice.ImpressDocument.1" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( "soffice.StarMathDocument.6" );
+        return OUString( "soffice.StarMathDocument.6" );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( "LibreOffice.MathDocument.1" );
+        return OUString( "LibreOffice.MathDocument.1" );
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString getServiceNameFromGUID_Impl( GUID* guid )
+OUString getServiceNameFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
+        return OUString( "com.sun.star.comp.Writer.TextDocument" );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( "com.sun.star.comp.Writer.TextDocument" );
+        return OUString( "com.sun.star.comp.Writer.TextDocument" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+        return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
+        return OUString( "com.sun.star.comp.Calc.SpreadsheetDocument" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
+        return OUString( "com.sun.star.comp.Draw.DrawingDocument" );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( "com.sun.star.comp.Draw.DrawingDocument" );
+        return OUString( "com.sun.star.comp.Draw.DrawingDocument" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
+        return OUString( "com.sun.star.comp.Draw.PresentationDocument" );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( "com.sun.star.comp.Draw.PresentationDocument" );
+        return OUString( "com.sun.star.comp.Draw.PresentationDocument" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" );
+        return OUString( "com.sun.star.comp.Math.FormulaDocument" );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( "com.sun.star.comp.Math.FormulaDocument" );
+        return OUString( "com.sun.star.comp.Math.FormulaDocument" );
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString getFilterNameFromGUID_Impl( GUID* guid )
+OUString getFilterNameFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
+        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( "writer8" );
+        return OUString( "writer8" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
+        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( "calc8" );
+        return OUString( "calc8" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
+        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( "draw8" );
+        return OUString( "draw8" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
+        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( "impress8" );
+        return OUString( "impress8" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
+        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( "math8" );
+        return OUString( "math8" );
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid )
+OUString getTestFileURLFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxw" );
+        return OUString( "file:///d:/OLE_TEST/test.sxw" );
 
     if ( *guid == OID_WriterOASISTextServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odt" );
+        return OUString( "file:///d:/OLE_TEST/test.odt" );
 
     if ( *guid == OID_CalcServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxc" );
+        return OUString( "file:///d:/OLE_TEST/test.sxc" );
 
     if ( *guid == OID_CalcOASISServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.ods" );
+        return OUString( "file:///d:/OLE_TEST/test.ods" );
 
     if ( *guid == OID_DrawingServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxd" );
+        return OUString( "file:///d:/OLE_TEST/test.sxd" );
 
     if ( *guid == OID_DrawingOASISServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odg" );
+        return OUString( "file:///d:/OLE_TEST/test.odg" );
 
     if ( *guid == OID_PresentationServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxi" );
+        return OUString( "file:///d:/OLE_TEST/test.sxi" );
 
     if ( *guid == OID_PresentationOASISServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odp" );
+        return OUString( "file:///d:/OLE_TEST/test.odp" );
 
     if ( *guid == OID_MathServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.sxm" );
+        return OUString( "file:///d:/OLE_TEST/test.sxm" );
 
     if ( *guid == OID_MathOASISServer )
-        return ::rtl::OUString( "file:///d:/OLE_TEST/test.odf" );
+        return OUString( "file:///d:/OLE_TEST/test.odf" );
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 // Fix strange warnings about some
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index e617ca1f3eb9..df1bc83fb959 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 
 
 
-uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);
+uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL);
 
 
 
@@ -38,8 +38,8 @@ uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);
 struct equalOUString
 {
     bool operator()(
-        const rtl::OUString& rKey1,
-        const rtl::OUString& rKey2 ) const
+        const OUString& rKey1,
+        const OUString& rKey2 ) const
     {
         return !!( rKey1 == rKey2 );
     }
@@ -48,7 +48,7 @@ struct equalOUString
 
 struct hashOUString
 {
-    size_t operator()( const rtl::OUString& rName ) const
+    size_t operator()( const OUString& rName ) const
     {
         return rName.hashCode();
     }
@@ -58,12 +58,12 @@ struct hashOUString
 
 class StatusChangeListenerContainer
     : public ::cppu::OMultiTypeInterfaceContainerHelperVar<
-rtl::OUString,hashOUString,equalOUString>
+OUString,hashOUString,equalOUString>
 {
 public:
     StatusChangeListenerContainer( ::osl::Mutex& aMutex )
         :  cppu::OMultiTypeInterfaceContainerHelperVar<
-    rtl::OUString,hashOUString,equalOUString>(aMutex)
+    OUString,hashOUString,equalOUString>(aMutex)
     {
     }
 };
@@ -127,12 +127,12 @@ Interceptor::Interceptor(
       m_pDisposeEventListeners(0),
       m_bLink( bLink )
 {
-    m_aInterceptedURL[0] = rtl::OUString(".uno:Save");
-    m_aInterceptedURL[1] = rtl::OUString(".uno:SaveAll");
-    m_aInterceptedURL[2] = rtl::OUString(".uno:CloseDoc");
-    m_aInterceptedURL[3] = rtl::OUString(".uno:CloseWin");
-    m_aInterceptedURL[4] = rtl::OUString(".uno:CloseFrame");
-    m_aInterceptedURL[5] = rtl::OUString(".uno:SaveAs");
+    m_aInterceptedURL[0] = OUString(".uno:Save");
+    m_aInterceptedURL[1] = OUString(".uno:SaveAll");
+    m_aInterceptedURL[2] = OUString(".uno:CloseDoc");
+    m_aInterceptedURL[3] = OUString(".uno:CloseWin");
+    m_aInterceptedURL[4] = OUString(".uno:CloseFrame");
+    m_aInterceptedURL[5] = OUString(".uno:SaveAs");
 }
 
 
@@ -209,12 +209,12 @@ Interceptor::dispatch(
                 if ( nInd == aNewArgs.getLength() )
                 {
                     aNewArgs.realloc( nInd + 1 );
-                    aNewArgs[nInd].Name = ::rtl::OUString( "SaveTo" );
+                    aNewArgs[nInd].Name = OUString( "SaveTo" );
                     aNewArgs[nInd].Value <<= sal_True;
                 }
 
                 uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                    URL, ::rtl::OUString( "_self" ), 0 );
+                    URL, OUString( "_self" ), 0 );
                 if ( xDispatch.is() )
                     xDispatch->dispatch( URL, aNewArgs );
             }
@@ -236,7 +236,7 @@ void Interceptor::generateFeatureStateEvent()
                 pTmpDocH = m_pDocH;
         }
 
-        ::rtl::OUString aTitle;
+        OUString aTitle;
         if ( pTmpDocH )
             aTitle = pTmpDocH->getTitle();
 
@@ -260,8 +260,8 @@ void Interceptor::generateFeatureStateEvent()
             {
 
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
-                aStateEvent.FeatureDescriptor = rtl::OUString("Update");
-                aStateEvent.State <<= (rtl::OUString(
+                aStateEvent.FeatureDescriptor = OUString("Update");
+                aStateEvent.State <<= (OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
                                        aTitle);
 
@@ -269,15 +269,15 @@ void Interceptor::generateFeatureStateEvent()
             else if ( i == 5 )
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
-                aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
-                aStateEvent.State <<= (rtl::OUString(
+                aStateEvent.FeatureDescriptor = OUString("SaveCopyTo");
+                aStateEvent.State <<= (OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($3)")));
             }
             else
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
-                aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
-                aStateEvent.State <<= (rtl::OUString(
+                aStateEvent.FeatureDescriptor = OUString("Close and Return");
+                aStateEvent.State <<= (OUString(
                     RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
                                        aTitle);
 
@@ -319,16 +319,16 @@ Interceptor::addStatusListener(
                 pTmpDocH = m_pDocH;
         }
 
-        ::rtl::OUString aTitle;
+        OUString aTitle;
         if ( pTmpDocH )
             aTitle = pTmpDocH->getTitle();
 
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
-        aStateEvent.FeatureDescriptor = rtl::OUString("Update");
+        aStateEvent.FeatureDescriptor = OUString("Update");
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (rtl::OUString(
+        aStateEvent.State <<= (OUString(
             RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
                                aTitle );
         Control->statusChanged(aStateEvent);
@@ -359,16 +359,16 @@ Interceptor::addStatusListener(
                 pTmpDocH = m_pDocH;
         }
 
-        ::rtl::OUString aTitle;
+        OUString aTitle;
         if ( pTmpDocH )
             aTitle = pTmpDocH->getTitle();
 
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
-        aStateEvent.FeatureDescriptor = rtl::OUString("Close and Return");
+        aStateEvent.FeatureDescriptor = OUString("Close and Return");
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (rtl::OUString(
+        aStateEvent.State <<= (OUString(
             RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
                                aTitle );
         Control->statusChanged(aStateEvent);
@@ -389,10 +389,10 @@ Interceptor::addStatusListener(
     {   // SaveAs
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
-        aStateEvent.FeatureDescriptor = rtl::OUString("SaveCopyTo");
+        aStateEvent.FeatureDescriptor = OUString("SaveCopyTo");
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
+        aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
         Control->statusChanged(aStateEvent);
 
         {
@@ -428,7 +428,7 @@ Interceptor::removeStatusListener(
 
 
 //XInterceptorInfo
-uno::Sequence< ::rtl::OUString >
+uno::Sequence< OUString >
 SAL_CALL
 Interceptor::getInterceptedURLs(  )
     throw (
@@ -438,7 +438,7 @@ Interceptor::getInterceptedURLs(  )
     // now implemented as update
     if ( m_bLink )
     {
-        uno::Sequence< ::rtl::OUString > aResult( 2 );
+        uno::Sequence< OUString > aResult( 2 );
         aResult[0] = m_aInterceptedURL[1];
         aResult[1] = m_aInterceptedURL[5];
 
@@ -454,7 +454,7 @@ Interceptor::getInterceptedURLs(  )
 uno::Reference< frame::XDispatch > SAL_CALL
 Interceptor::queryDispatch(
     const util::URL& URL,
-    const ::rtl::OUString& TargetFrameName,
+    const OUString& TargetFrameName,
     sal_Int32 SearchFlags )
     throw (
         uno::RuntimeException
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 1a58ad5f8b94..4f9b53f9f9e6 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -43,16 +43,16 @@ throw (uno::Exception)
     return xService;
 }
 
-::rtl::OUString SAL_CALL EmbedServer_getImplementationName() throw()
+OUString SAL_CALL EmbedServer_getImplementationName() throw()
 {
-    return ::rtl::OUString("com.sun.star.comp.ole.EmbedServer");
+    return OUString("com.sun.star.comp.ole.EmbedServer");
 
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw()
+uno::Sequence< OUString > SAL_CALL EmbedServer_getSupportedServiceNames() throw()
 {
-    uno::Sequence< ::rtl::OUString > aServiceNames( 1 );
-    aServiceNames[0] = ::rtl::OUString( "com.sun.star.document.OleEmbeddedServerRegistration" );
+    uno::Sequence< OUString > aServiceNames( 1 );
+    aServiceNames[0] = OUString( "com.sun.star.document.OleEmbeddedServerRegistration" );
     return aServiceNames;
 }
 
@@ -62,7 +62,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emser_component_getFactory( const sal_Char
 {
     void * pRet = 0;
 
-    ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
+    OUString aImplName( OUString::createFromAscii( pImplName ) );
     uno::Reference< lang::XSingleServiceFactory > xFactory;
 
     if(pServiceManager && aImplName.equals( EmbedServer_getImplementationName() ) )
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index 3e60df87f15d..61c6ef80e236 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -92,7 +92,7 @@ private:
     ::com::sun::star::uno::Reference<
     ::com::sun::star::frame::XFrame > m_xFrame;
 
-    ::rtl::OUString m_aContainerName,m_aDocumentNamePart,m_aFilterName;
+    OUString m_aContainerName,m_aDocumentNamePart,m_aFilterName;
 
     CComPtr< IDispatch > m_pIDispatch;
 
@@ -165,11 +165,11 @@ public:
 
     void resizeWin( const SIZEL& rNewSize );
 
-    void setTitle(const rtl::OUString& aDocumentName);
-    rtl::OUString getTitle() const { return m_aDocumentNamePart; }
+    void setTitle(const OUString& aDocumentName);
+    OUString getTitle() const { return m_aDocumentNamePart; }
 
-    void setContainerName(const rtl::OUString& aContainerName);
-    rtl::OUString getContainerName() const { return m_aContainerName; }
+    void setContainerName(const OUString& aContainerName);
+    OUString getContainerName() const { return m_aContainerName; }
     void OnPosRectChanged(LPRECT lpRect) const;
     void show();
 
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 1962c5451748..34c867c11b40 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -157,7 +157,7 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
 
     DocumentHolder*                     m_pDocHolder;
-    ::rtl::OUString                     m_aFileName;
+    OUString                     m_aFileName;
 
     CComPtr< IStorage >                 m_pMasterStorage;
     CComPtr< IStream >                  m_pOwnStream;
diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx
index f7c71e71fb31..4ba43d1f28b4 100644
--- a/embedserv/source/inc/intercept.hxx
+++ b/embedserv/source/inc/intercept.hxx
@@ -99,7 +99,7 @@ public:
         );
 
     //XInterceptorInfo
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    virtual ::com::sun::star::uno::Sequence< OUString >
     SAL_CALL getInterceptedURLs(  )
         throw (
             ::com::sun::star::uno::RuntimeException
@@ -111,7 +111,7 @@ public:
     ::com::sun::star::frame::XDispatch > SAL_CALL
     queryDispatch(
         const ::com::sun::star::util::URL& URL,
-        const ::rtl::OUString& TargetFrameName,
+        const OUString& TargetFrameName,
         sal_Int32 SearchFlags )
         throw (
             ::com::sun::star::uno::RuntimeException
@@ -175,7 +175,7 @@ private:
     ::com::sun::star::uno::Reference<
     ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider;
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    static ::com::sun::star::uno::Sequence< OUString >
     m_aInterceptedURL;
 
     cppu::OInterfaceContainerHelper*    m_pDisposeEventListeners;