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

4 files changed, 126 insertions, 126 deletions

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index f34d55c68a04..b9deda50e7a7 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -102,12 +102,12 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
                             sal_Int32 nTargetIndex,
                             const uno::Reference< container::XIndexAccess >& xSourceMenu,
                             sal_Int32 nSourceIndex,
-                            const ::rtl::OUString aContModuleName,
+                            const OUString aContModuleName,
                             const uno::Reference< frame::XDispatchProvider >& xSourceDisp )
 {
     sal_Int32 nInd = 0;
-    ::rtl::OUString aModuleIdentPropName( "ModuleIdentifier" );
-    ::rtl::OUString aDispProvPropName( "DispatchProvider" );
+    OUString aModuleIdentPropName( "ModuleIdentifier" );
+    OUString aDispProvPropName( "DispatchProvider" );
     sal_Bool bModuleNameSet = sal_False;
     sal_Bool bDispProvSet = sal_False;
 
@@ -164,11 +164,11 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
     m_aOutplaceFrameProps.realloc( 3 );
     beans::NamedValue aArg;
 
-    aArg.Name = ::rtl::OUString("TopWindow");
+    aArg.Name = OUString("TopWindow");
     aArg.Value <<= sal_True;
     m_aOutplaceFrameProps[0] <<= aArg;
 
-    aArg.Name = ::rtl::OUString("MakeVisible");
+    aArg.Name = OUString("MakeVisible");
     aArg.Value <<= sal_False;
     m_aOutplaceFrameProps[1] <<= aArg;
 
@@ -183,7 +183,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
     }
     m_refCount--;
 
-    aArg.Name = ::rtl::OUString("ParentFrame");
+    aArg.Name = OUString("ParentFrame");
     aArg.Value <<= xDesktop; //TODO/LATER: should use parent document frame
     m_aOutplaceFrameProps[2] <<= aArg;
 }
@@ -366,7 +366,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra
     {
         uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
         uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY_THROW );
-        xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xLayoutManager;
+        xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xLayoutManager;
         if ( xLayoutManager.is() )
         {
             xLayoutManager->setVisible( bVisible );
@@ -434,7 +434,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
         }
 
         awt::WindowDescriptor aOwnWinDescriptor( awt::WindowClass_TOP,
-                                                ::rtl::OUString("dockingwindow"),
+                                                OUString("dockingwindow"),
                                                 xMyParent,
                                                 0,
                                                 awt::Rectangle(),//aOwnRectangle,
@@ -453,14 +453,14 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
         uno::Sequence< uno::Any > aArgs( 2 );
         beans::NamedValue aArg;
 
-        aArg.Name    = ::rtl::OUString("ContainerWindow");
+        aArg.Name    = OUString("ContainerWindow");
         aArg.Value <<= xOwnWindow;
         aArgs[0] <<= aArg;
 
         uno::Reference< frame::XFrame > xContFrame( xContDisp, uno::UNO_QUERY );
         if ( xContFrame.is() )
         {
-            aArg.Name    = ::rtl::OUString("ParentFrame");
+            aArg.Name    = OUString("ParentFrame");
             aArg.Value <<= xContFrame;
             aArgs[1] <<= aArg;
         }
@@ -535,7 +535,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
         if( xUIConfigManager.is())
         {
             xResult = xUIConfigManager->getSettings(
-                ::rtl::OUString( "private:resource/menubar/menubar" ),
+                OUString( "private:resource/menubar/menubar" ),
                 sal_False );
         }
     }
@@ -546,7 +546,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
     {
         // no internal document configuration, use the one from the module
         uno::Reference< frame::XModuleManager2 > xModuleMan = frame::ModuleManager::create(m_xContext);
-        ::rtl::OUString aModuleIdent =
+        OUString aModuleIdent =
             xModuleMan->identify( uno::Reference< uno::XInterface >( m_xComponent, uno::UNO_QUERY ) );
 
         if ( !aModuleIdent.isEmpty() )
@@ -557,7 +557,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
                     xModConfSupplier->getUIConfigurationManager( aModuleIdent ),
                     uno::UNO_QUERY_THROW );
             xResult = xModUIConfMan->getSettings(
-                    ::rtl::OUString( "private:resource/menubar/menubar" ),
+                    OUString( "private:resource/menubar/menubar" ),
                     sal_False );
         }
     }
@@ -580,7 +580,7 @@ void DocumentHolder::FindConnectPoints(
     {
         uno::Sequence< beans::PropertyValue > aProps;
         xMenu->getByIndex( nInd ) >>= aProps;
-        rtl::OUString aCommand;
+        OUString aCommand;
         for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ )
             if ( aProps[nSeqInd].Name == "CommandURL" )
             {
@@ -602,7 +602,7 @@ void DocumentHolder::FindConnectPoints(
 uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
         const uno::Reference< container::XIndexAccess >& xContMenu,
         const uno::Reference< frame::XDispatchProvider >& xContDisp,
-        const ::rtl::OUString& aContModuleName,
+        const OUString& aContModuleName,
         const uno::Reference< container::XIndexAccess >& xOwnMenu,
         const uno::Reference< frame::XDispatchProvider >& xOwnDisp )
     throw ( uno::Exception )
@@ -639,7 +639,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
             }
         }
         else
-            InsertMenu_Impl( xMergedMenu, nInd, xOwnMenu, nInd, ::rtl::OUString(), xOwnDisp );
+            InsertMenu_Impl( xMergedMenu, nInd, xOwnMenu, nInd, OUString(), xOwnDisp );
     }
 
     return uno::Reference< container::XIndexAccess >( xMergedMenu, uno::UNO_QUERY_THROW );
@@ -649,14 +649,14 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
 sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
                                                const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
                                             const uno::Reference< frame::XDispatchProvider >& xContDisp,
-                                            const ::rtl::OUString& aContModuleName )
+                                            const OUString& aContModuleName )
 {
     sal_Bool bMenuMerged = sal_False;
     try
     {
         uno::Reference< ::com::sun::star::ui::XUIElementSettings > xUISettings(
             xContLM->getElement(
-                ::rtl::OUString( "private:resource/menubar/menubar" ) ),
+                OUString( "private:resource/menubar/menubar" ) ),
             uno::UNO_QUERY_THROW );
         uno::Reference< container::XIndexAccess > xContMenu = xUISettings->getSettings( sal_True );
         if ( !xContMenu.is() )
@@ -678,7 +678,7 @@ sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star
 
 sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM,
                                  const uno::Reference< frame::XDispatchProvider >& xContainerDP,
-                                 const ::rtl::OUString& aContModuleName )
+                                 const OUString& aContModuleName )
 {
     sal_Bool bResult = sal_False;
     if ( xContainerLM.is() )
@@ -690,7 +690,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
         try
         {
             uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
-            xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM;
+            xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM;
             xDocAreaAcc = xContainerLM->getDockingAreaAcceptor();
         }
         catch( const uno::Exception& ){}
@@ -783,7 +783,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::
 
         try {
             uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
-            xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM;
+            xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM;
         } catch( const uno::Exception& )
         {}
 
@@ -860,7 +860,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
         uno::Reference< ::com::sun::star::frame::XLayoutManager > xOwnLM;
         try {
             uno::Reference< beans::XPropertySet > xPropSet( m_xFrame, uno::UNO_QUERY_THROW );
-            xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )) >>= xOwnLM;
+            xPropSet->getPropertyValue( OUString( "LayoutManager" )) >>= xOwnLM;
         } catch( const uno::Exception& )
         {}
 
@@ -969,21 +969,21 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
             aArgs.put( "ReadOnly", m_bReadOnly );
             if ( bInPlace )
                 aArgs.put( "PluginMode", sal_Int16(1) );
-            ::rtl::OUString sUrl;
+            OUString sUrl;
             uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY);
             if (    xServiceInfo.is()
-                &&  xServiceInfo->supportsService(::rtl::OUString("com.sun.star.report.ReportDefinition")) )
+                &&  xServiceInfo->supportsService(OUString("com.sun.star.report.ReportDefinition")) )
             {
-                sUrl = ::rtl::OUString(".component:DB/ReportDesign");
+                sUrl = OUString(".component:DB/ReportDesign");
             }
             else if( xServiceInfo.is()
-                &&   xServiceInfo->supportsService( ::rtl::OUString("com.sun.star.chart2.ChartDocument") ))
-                sUrl = ::rtl::OUString("private:factory/schart");
+                &&   xServiceInfo->supportsService( OUString("com.sun.star.chart2.ChartDocument") ))
+                sUrl = OUString("private:factory/schart");
             else
-                sUrl = ::rtl::OUString("private:object");
+                sUrl = OUString("private:object");
 
             xComponentLoader->loadComponentFromURL( sUrl,
-                                                        rtl::OUString( "_self" ),
+                                                        OUString( "_self" ),
                                                         0,
                                                         aArgs.getPropertyValues() );
 
@@ -1173,7 +1173,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent )
     // if the component does not support document::XEventBroadcaster
     // the modify notifications are used as workaround, but only for running state
     if( aEvent.Source == m_xComponent && m_pEmbedObj && m_pEmbedObj->getCurrentState() == embed::EmbedStates::RUNNING )
-        m_pEmbedObj->PostEvent_Impl( ::rtl::OUString( "OnVisAreaChanged" ) );
+        m_pEmbedObj->PostEvent_Impl( OUString( "OnVisAreaChanged" ) );
 }
 
 //---------------------------------------------------------------------------
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 9d62ae63ce91..12fb3189300c 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -44,12 +44,12 @@ void ODummyEmbeddedObject::CheckInit()
         throw lang::DisposedException();
 
     if ( m_nObjectState == -1 )
-        throw embed::WrongStateException( ::rtl::OUString( "The object has no persistence!\n" ),
+        throw embed::WrongStateException( OUString( "The object has no persistence!\n" ),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
 //----------------------------------------------
-void ODummyEmbeddedObject::PostEvent_Impl( const ::rtl::OUString& aEventName )
+void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
 {
     if ( m_pInterfaceContainer )
     {
@@ -208,7 +208,7 @@ sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 )
 }
 
 //----------------------------------------------
-void SAL_CALL ODummyEmbeddedObject::setContainerName( const ::rtl::OUString& )
+void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& )
         throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -228,7 +228,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
+        throw embed::WrongStateException( OUString( "Illegal call!\n" ),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     m_nCachedAspect = nAspect;
@@ -249,12 +249,12 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
+        throw embed::WrongStateException( OUString( "Illegal call!\n" ),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( !m_bHasCachedSize || m_nCachedAspect != nAspect )
         throw embed::NoVisualAreaSizeException(
-                ::rtl::OUString( "No size available!\n" ),
+                OUString( "No size available!\n" ),
                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aCachedSize;
@@ -271,7 +271,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
     OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
         // no representation can be retrieved
-        throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
+        throw embed::WrongStateException( OUString( "Illegal call!\n" ),
                                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return embed::EmbedMapUnits::ONE_100TH_MM;
@@ -288,14 +288,14 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep
     CheckInit();
 
     // no representation can be retrieved
-    throw embed::WrongStateException( ::rtl::OUString( "Illegal call!\n" ),
+    throw embed::WrongStateException( OUString( "Illegal call!\n" ),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
 //----------------------------------------------
 void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
                     const uno::Reference< embed::XStorage >& xStorage,
-                    const ::rtl::OUString& sEntName,
+                    const OUString& sEntName,
                     sal_Int32 nEntryConnectionMode,
                     const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                     const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
@@ -310,12 +310,12 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
         throw lang::DisposedException(); // TODO
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( sEntName.isEmpty() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -323,7 +323,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
       && ( m_nObjectState == -1 || nEntryConnectionMode != embed::EntryInitModes::NO_INIT ) )
     {
         throw embed::WrongStateException(
-                    ::rtl::OUString( "Can't change persistent representation of activated object!\n" ),
+                    OUString( "Can't change persistent representation of activated object!\n" ),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -333,7 +333,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
             saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
         else
             throw embed::WrongStateException(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                        OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
     }
 
@@ -348,20 +348,20 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
             m_nObjectState = embed::EmbedStates::LOADED;
         }
         else
-            throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong entry is provided!\n" ),
+            throw lang::IllegalArgumentException( OUString( "Wrong entry is provided!\n" ),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                 2 );
 
     }
     else
-        throw lang::IllegalArgumentException( ::rtl::OUString( "Wrong connection mode is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "Wrong connection mode is provided!\n" ),
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                 3 );
 }
 
 //------------------------------------------------------
 void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage,
-                            const ::rtl::OUString& sEntName,
+                            const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                             const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
         throw ( lang::IllegalArgumentException,
@@ -375,7 +375,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
@@ -383,7 +383,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X
 
 //------------------------------------------------------
 void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage,
-                            const ::rtl::OUString& sEntName,
+                            const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                             const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
         throw ( lang::IllegalArgumentException,
@@ -397,10 +397,10 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
-    PostEvent_Impl( ::rtl::OUString( "OnSaveAs" ) );
+    PostEvent_Impl( OUString( "OnSaveAs" ) );
 
     m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
 
@@ -435,11 +435,11 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
         m_xParentStorage = m_xNewParentStorage;
         m_aEntryName = m_aNewEntryName;
 
-        PostEvent_Impl( ::rtl::OUString( "OnSaveAsDone" ) );
+        PostEvent_Impl( OUString( "OnSaveAsDone" ) );
     }
 
     m_xNewParentStorage = uno::Reference< embed::XStorage >();
-    m_aNewEntryName = ::rtl::OUString();
+    m_aNewEntryName = OUString();
     m_bWaitSaveCompleted = sal_False;
 }
 
@@ -453,7 +453,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     if ( !m_aEntryName.isEmpty() )
@@ -463,7 +463,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
 }
 
 //------------------------------------------------------
-::rtl::OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
+OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
 {
@@ -472,7 +472,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     return m_aEntryName;
@@ -490,7 +490,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // the object can not be activated or changed
@@ -507,7 +507,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // this object can not be changed
@@ -529,7 +529,7 @@ void SAL_CALL ODummyEmbeddedObject::reload(
 
     if ( m_bWaitSaveCompleted )
         throw embed::WrongStateException(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
                     uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 
     // nothing to reload
@@ -548,19 +548,19 @@ uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID()
 }
 
 //------------------------------------------------------
-::rtl::OUString SAL_CALL ODummyEmbeddedObject::getClassName()
+OUString SAL_CALL ODummyEmbeddedObject::getClassName()
         throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_bDisposed )
         throw lang::DisposedException(); // TODO
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //------------------------------------------------------
 void SAL_CALL ODummyEmbeddedObject::setClassInfo(
-                const uno::Sequence< sal_Int8 >& /*aClassID*/, const ::rtl::OUString& /*aClassName*/ )
+                const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ )
         throw ( lang::NoSupportException,
                 uno::RuntimeException )
 {
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index a47ef9bed158..7848b8e549c8 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -29,13 +29,13 @@ using namespace ::com::sun::star;
 #define IUL 6
 
 
-uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL);
+uno::Sequence< 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 );
     }
@@ -44,7 +44,7 @@ struct equalOUString
 
 struct hashOUString
 {
-    size_t operator()( const rtl::OUString& rName ) const
+    size_t operator()( const OUString& rName ) const
     {
         return rName.hashCode();
     }
@@ -54,12 +54,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)
     {
     }
 };
@@ -103,12 +103,12 @@ Interceptor::Interceptor( DocumentHolder* pDocHolder )
       m_pDisposeEventListeners(0),
       m_pStatCL(0)
 {
-    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");
 
 }
 
@@ -166,12 +166,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 );
         }
@@ -194,10 +194,10 @@ Interceptor::addStatusListener(
     {   // Save
         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( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() );
+        aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() );
         Control->statusChanged(aStateEvent);
 
         {
@@ -218,10 +218,10 @@ Interceptor::addStatusListener(
     {   // Close and return
         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( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() );
+        aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() );
         Control->statusChanged(aStateEvent);
 
 
@@ -240,10 +240,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);
 
         {
@@ -279,7 +279,7 @@ Interceptor::removeStatusListener(
 
 
 //XInterceptorInfo
-uno::Sequence< ::rtl::OUString >
+uno::Sequence< OUString >
 SAL_CALL
 Interceptor::getInterceptedURLs(  )
     throw (
@@ -297,7 +297,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/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index c3ac0250c74c..b3e025777260 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -41,18 +41,18 @@ using namespace ::com::sun::star;
 
 
 //-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
 {
-    uno::Sequence< ::rtl::OUString > aRet(2);
-    aRet[0] = ::rtl::OUString("com.sun.star.embed.EmbeddedObjectCreator");
-    aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
+    uno::Sequence< OUString > aRet(2);
+    aRet[0] = OUString("com.sun.star.embed.EmbeddedObjectCreator");
+    aRet[1] = OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
     return aRet;
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName()
+OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName()
 {
-    return ::rtl::OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
+    return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
 }
 
 //-------------------------------------------------------------------------
@@ -65,9 +65,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_static
 //-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitNew(
                                             const uno::Sequence< sal_Int8 >& aClassID,
-                                            const ::rtl::OUString& aClassName,
+                                            const OUString& aClassName,
                                             const uno::Reference< embed::XStorage >& xStorage,
-                                            const ::rtl::OUString& sEntName,
+                                            const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
     throw ( lang::IllegalArgumentException,
             io::IOException,
@@ -79,21 +79,21 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     uno::Reference< uno::XInterface > xResult;
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             3 );
 
     if ( sEntName.isEmpty() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             4 );
 
-    ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID );
+    OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID );
     if ( aEmbedFactory.isEmpty() )
     {
         // use system fallback
         // TODO: in future users factories can be tested
-        aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
+        aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
     }
 
     uno::Reference < uno::XInterface > xFact( m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext) );
@@ -110,7 +110,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 //-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromEntry(
                                                                     const uno::Reference< embed::XStorage >& xStorage,
-                                                                    const ::rtl::OUString& sEntName,
+                                                                    const OUString& sEntName,
                                                                     const uno::Sequence< beans::PropertyValue >& aMedDescr,
                                                                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
     throw ( lang::IllegalArgumentException,
@@ -122,12 +122,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     RTL_LOGFILE_CONTEXT( aLog, "embeddedobj (mv76033) UNOEmbeddedObjectCreator::createInstanceInitFromEntry" );
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( sEntName.isEmpty() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -139,8 +139,8 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     if ( !xNameAccess->hasByName( sEntName ) )
         throw container::NoSuchElementException();
 
-    ::rtl::OUString aMediaType;
-    ::rtl::OUString aEmbedFactory;
+    OUString aMediaType;
+    OUString aEmbedFactory;
     if ( xStorage->isStorageElement( sEntName ) )
     {
         // the object must be based on storage
@@ -152,7 +152,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
             throw uno::RuntimeException();
 
         try {
-            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ));
+            uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ));
             aAny >>= aMediaType;
         }
         catch ( const uno::Exception& )
@@ -184,10 +184,10 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
             throw uno::RuntimeException();
 
         try {
-            uno::Any aAny = xPropSet->getPropertyValue( ::rtl::OUString( "MediaType" ));
+            uno::Any aAny = xPropSet->getPropertyValue( OUString( "MediaType" ));
             aAny >>= aMediaType;
             if ( aMediaType == "application/vnd.sun.star.oleobject" )
-                aEmbedFactory = ::rtl::OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
+                aEmbedFactory = OUString( "com.sun.star.embed.OLEEmbeddedObjectFactory" );
         }
         catch ( const uno::Exception& )
         {
@@ -217,7 +217,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 
         uno::Reference < embed::XEmbedObjectFactory > xEmbFact( xFact, uno::UNO_QUERY );
         if ( xEmbFact.is() )
-            return xEmbFact->createInstanceUserInit( uno::Sequence< sal_Int8 >(), ::rtl::OUString(), xStorage, sEntName, embed::EntryInitModes::DEFAULT_INIT, aMedDescr, lObjArgs);
+            return xEmbFact->createInstanceUserInit( uno::Sequence< sal_Int8 >(), OUString(), xStorage, sEntName, embed::EntryInitModes::DEFAULT_INIT, aMedDescr, lObjArgs);
     }
 
     // the default object should be created, it will allow to store the contents on the next saving
@@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 //-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromMediaDescriptor(
         const uno::Reference< embed::XStorage >& xStorage,
-        const ::rtl::OUString& sEntName,
+        const OUString& sEntName,
         const uno::Sequence< beans::PropertyValue >& aMediaDescr,
         const uno::Sequence< beans::PropertyValue >& lObjArgs )
     throw ( lang::IllegalArgumentException,
@@ -243,12 +243,12 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     // TODO: use lObjArgs
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             1 );
 
     if ( sEntName.isEmpty() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             2 );
 
@@ -256,7 +256,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr );
 
     // check if there is FilterName
-    ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False );
+    OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False );
 
     if ( !aFilterName.isEmpty() )
     {
@@ -292,9 +292,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 //-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceUserInit(
         const uno::Sequence< sal_Int8 >& aClassID,
-        const ::rtl::OUString& sClassName,
+        const OUString& sClassName,
         const uno::Reference< embed::XStorage >& xStorage,
-        const ::rtl::OUString& sEntName,
+        const OUString& sEntName,
         sal_Int32 nEntryConnectionMode,
         const uno::Sequence< beans::PropertyValue >& aArgs,
         const uno::Sequence< beans::PropertyValue >& aObjectArgs )
@@ -308,16 +308,16 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     uno::Reference< uno::XInterface > xResult;
 
     if ( !xStorage.is() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             3 );
 
     if ( sEntName.isEmpty() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ),
                                             uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                             4 );
 
-    ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID );
+    OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID );
     uno::Reference< embed::XEmbedObjectFactory > xEmbFactory(
                         m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext),
                         uno::UNO_QUERY );
@@ -336,7 +336,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 //-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLink(
                                             const uno::Reference< embed::XStorage >& xStorage,
-                                            const ::rtl::OUString& sEntName,
+                                            const OUString& sEntName,
                                             const uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                             const uno::Sequence< beans::PropertyValue >& lObjArgs )
         throw ( lang::IllegalArgumentException,
@@ -351,17 +351,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     uno::Sequence< beans::PropertyValue > aTempMedDescr( aMediaDescr );
 
     // check if there is URL, URL must exist
-    ::rtl::OUString aURL;
+    OUString aURL;
     for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ )
         if ( aTempMedDescr[nInd].Name == "URL" )
             aTempMedDescr[nInd].Value >>= aURL;
 
     if ( aURL.isEmpty() )
-        throw lang::IllegalArgumentException( ::rtl::OUString( "No URL for the link is provided!\n" ),
+        throw lang::IllegalArgumentException( OUString( "No URL for the link is provided!\n" ),
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ),
                                         3 );
 
-    ::rtl::OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False );
+    OUString aFilterName = m_aConfigHelper.UpdateMediaDescriptorWithFilterName( aTempMedDescr, sal_False );
 
     if ( !aFilterName.isEmpty() )
     {
@@ -386,13 +386,13 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
         // was also extended.
 
         if ( !xStorage.is() )
-            throw lang::IllegalArgumentException( ::rtl::OUString( "No parent storage is provided!\n" ),
+            throw lang::IllegalArgumentException( OUString( "No parent storage is provided!\n" ),
                                                 uno::Reference< uno::XInterface >(
                                                     static_cast< ::cppu::OWeakObject* >(this) ),
                                                 3 );
 
         if ( sEntName.isEmpty() )
-            throw lang::IllegalArgumentException( ::rtl::OUString( "Empty element name is provided!\n" ),
+            throw lang::IllegalArgumentException( OUString( "Empty element name is provided!\n" ),
                                                 uno::Reference< uno::XInterface >(
                                                     static_cast< ::cppu::OWeakObject* >(this) ),
                                                 4 );
@@ -409,9 +409,9 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 //-------------------------------------------------------------------------
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit(
                                                 const uno::Sequence< sal_Int8 >& aClassID,
-                                                const ::rtl::OUString& aClassName,
+                                                const OUString& aClassName,
                                                 const uno::Reference< embed::XStorage >& xStorage,
-                                                const ::rtl::OUString& sEntName,
+                                                const OUString& sEntName,
                                                 const uno::Sequence< beans::PropertyValue >& lArguments,
                                                 const uno::Sequence< beans::PropertyValue >& lObjArgs )
         throw ( lang::IllegalArgumentException,
@@ -423,7 +423,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 
     uno::Reference< uno::XInterface > xResult;
 
-    ::rtl::OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID );
+    OUString aEmbedFactory = m_aConfigHelper.GetFactoryNameByClassID( aClassID );
     uno::Reference< embed::XLinkFactory > xLinkFactory(
                         m_xContext->getServiceManager()->createInstanceWithContext(aEmbedFactory, m_xContext),
                         uno::UNO_QUERY );
@@ -440,17 +440,17 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName()
+OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName()
     throw ( uno::RuntimeException )
 {
     return impl_staticGetImplementationName();
 }
 
 //-------------------------------------------------------------------------
-sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL UNOEmbeddedObjectCreator::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 == aSeq[nInd] )
@@ -460,7 +460,7 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const ::rtl::OUStri
 }
 
 //-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
     return impl_staticGetSupportedServiceNames();