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

15 files changed, 141 insertions, 144 deletions

diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 2d4d6af041f1..91bcd79f0295 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -65,7 +65,7 @@ void cancelCommandExecution( const uno::Any & rException,
 
             if ( xSelection.is() )
                 throw ucb::CommandFailedException(
-                                    rtl::OUString(),
+                                    OUString(),
                                     uno::Reference< uno::XInterface >(),
                                     rException );
         }
@@ -83,7 +83,7 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
                              const uno::Sequence< uno::Any > & rArgs,
                              const uno::Reference<
                                 ucb::XCommandEnvironment > & xEnv,
-                             const rtl::OUString & rMessage,
+                             const OUString & rMessage,
                              const uno::Reference<
                                     ucb::XCommandProcessor > & xContext )
     throw( uno::Exception )
@@ -103,7 +103,7 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
                 = xRequest->getSelection();
 
             if ( xSelection.is() )
-                throw ucb::CommandFailedException( rtl::OUString(),
+                throw ucb::CommandFailedException( OUString(),
                                                    xContext,
                                                    xRequest->getRequest() );
         }
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index c9ce548af225..2f1fde05a1f1 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -108,7 +108,7 @@ PropertiesEventListenerMap;
 
 struct equalStr
 {
-    bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const
+    bool operator()( const OUString& s1, const OUString& s2 ) const
       {
         return !!( s1 == s2 );
     }
@@ -116,7 +116,7 @@ struct equalStr
 
 struct hashStr
 {
-    size_t operator()( const rtl::OUString& rName ) const
+    size_t operator()( const OUString& rName ) const
     {
         return rName.hashCode();
     }
@@ -124,7 +124,7 @@ struct hashStr
 
 typedef cppu::OMultiTypeInterfaceContainerHelperVar
 <
-    rtl::OUString,
+    OUString,
     hashStr,
     equalStr
 > PropertyChangeListeners;
@@ -265,11 +265,11 @@ XTYPEPROVIDER_IMPL_10( ContentImplHelper,
 
 // virtual
 sal_Bool SAL_CALL ContentImplHelper::supportsService(
-                                            const rtl::OUString& ServiceName )
+                                            const OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
-    const rtl::OUString* pArray = aSNL.getConstArray();
+    uno::Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString* pArray = aSNL.getConstArray();
     for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
     {
         if ( pArray[ i ] == ServiceName )
@@ -425,7 +425,7 @@ sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier()
 
 // virtual
 void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
-        const uno::Sequence< rtl::OUString >& PropertyNames,
+        const uno::Sequence< OUString >& PropertyNames,
         const uno::Reference< beans::XPropertiesChangeListener >& Listener )
     throw( uno::RuntimeException )
 {
@@ -440,15 +440,15 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
     {
         // Note: An empty sequence means a listener for "all" properties.
         m_pImpl->m_pPropertyChangeListeners->addInterface(
-            rtl::OUString(), Listener );
+            OUString(), Listener );
     }
     else
     {
-        const rtl::OUString* pSeq = PropertyNames.getConstArray();
+        const OUString* pSeq = PropertyNames.getConstArray();
 
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
-            const rtl::OUString& rName = pSeq[ n ];
+            const OUString& rName = pSeq[ n ];
             if ( !rName.isEmpty() )
                 m_pImpl->m_pPropertyChangeListeners->addInterface(
                     rName, Listener );
@@ -459,7 +459,7 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
 //=========================================================================
 // virtual
 void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
-        const uno::Sequence< rtl::OUString >& PropertyNames,
+        const uno::Sequence< OUString >& PropertyNames,
         const uno::Reference< beans::XPropertiesChangeListener >& Listener )
     throw( uno::RuntimeException )
 {
@@ -473,15 +473,15 @@ void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
     {
         // Note: An empty sequence means a listener for "all" properties.
         m_pImpl->m_pPropertyChangeListeners->removeInterface(
-            rtl::OUString(), Listener );
+            OUString(), Listener );
     }
     else
     {
-        const rtl::OUString* pSeq = PropertyNames.getConstArray();
+        const OUString* pSeq = PropertyNames.getConstArray();
 
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
-            const rtl::OUString& rName = pSeq[ n ];
+            const OUString& rName = pSeq[ n ];
             if ( !rName.isEmpty() )
                 m_pImpl->m_pPropertyChangeListeners->removeInterface(
                     rName, Listener );
@@ -529,7 +529,7 @@ void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener(
 
 // virtual
 void SAL_CALL ContentImplHelper::addProperty(
-        const rtl::OUString& Name,
+        const OUString& Name,
         sal_Int16 Attributes,
         const uno::Any& DefaultValue )
     throw( beans::PropertyExistException,
@@ -625,7 +625,7 @@ void SAL_CALL ContentImplHelper::addProperty(
 
 //=========================================================================
 // virtual
-void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
+void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
     throw( beans::UnknownPropertyException,
            beans::NotRemoveableException,
            uno::RuntimeException )
@@ -699,7 +699,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name )
                     xReg = xSet->getRegistry();
                 if ( xReg.is() )
                 {
-                    rtl::OUString aKey( xSet->getKey() );
+                    OUString aKey( xSet->getKey() );
                     xSet = 0;
                     xReg->removePropertySet( aKey );
                 }
@@ -769,7 +769,7 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
     throw( uno::RuntimeException )
 {
     uno::Reference< uno::XInterface > xParent;
-    rtl::OUString aURL = getParentURL();
+    OUString aURL = getParentURL();
 
     if ( !aURL.isEmpty() )
     {
@@ -812,8 +812,8 @@ ContentImplHelper::getAdditionalPropertySet( sal_Bool bCreate )
 
 //=========================================================================
 sal_Bool ContentImplHelper::renameAdditionalPropertySet(
-    const rtl::OUString& rOldKey,
-    const rtl::OUString& rNewKey,
+    const OUString& rOldKey,
+    const OUString& rNewKey,
     sal_Bool bRecursive )
 {
     return m_xProvider->renameAdditionalPropertySet(
@@ -822,8 +822,8 @@ sal_Bool ContentImplHelper::renameAdditionalPropertySet(
 
 //=========================================================================
 sal_Bool ContentImplHelper::copyAdditionalPropertySet(
-    const rtl::OUString& rSourceKey,
-    const rtl::OUString& rTargetKey,
+    const OUString& rSourceKey,
+    const OUString& rTargetKey,
     sal_Bool bRecursive )
 {
     return m_xProvider->copyAdditionalPropertySet(
@@ -850,7 +850,7 @@ void ContentImplHelper::notifyPropertiesChange(
         // First, notify listeners interested in changes of every property.
         cppu::OInterfaceContainerHelper* pAllPropsContainer
             = m_pImpl->m_pPropertyChangeListeners->getContainer(
-                rtl::OUString() );
+                OUString() );
         if ( pAllPropsContainer )
         {
             cppu::OInterfaceIteratorHelper aIter( *pAllPropsContainer );
@@ -871,7 +871,7 @@ void ContentImplHelper::notifyPropertiesChange(
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
             const beans::PropertyChangeEvent& rEvent = pEvents[ n ];
-            const rtl::OUString& rName = rEvent.PropertyName;
+            const OUString& rName = rEvent.PropertyName;
 
             cppu::OInterfaceContainerHelper* pPropsContainer
                 = m_pImpl->m_pPropertyChangeListeners->getContainer( rName );
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index e99b67fcffd0..c700e741d3b7 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
 
-using ::rtl::OUString;
 
 namespace ucbhelper
 {
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index 54c62347e493..b9e8a258ed0d 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -151,7 +151,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 //=========================================================================
 // virtual
 beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
-        const rtl::OUString& aName )
+        const OUString& aName )
     throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     beans::Property aProp;
@@ -164,7 +164,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 //=========================================================================
 // virtual
 sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
-        const rtl::OUString& Name )
+        const OUString& Name )
     throw( uno::RuntimeException )
 {
     beans::Property aProp;
@@ -186,7 +186,7 @@ void PropertySetInfo::reset()
 
 //=========================================================================
 sal_Bool PropertySetInfo::queryProperty(
-    const rtl::OUString& rName, beans::Property& rProp )
+    const OUString& rName, beans::Property& rProp )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -298,7 +298,7 @@ CommandProcessorInfo::getCommands()
 // virtual
 com::sun::star::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByName(
-        const rtl::OUString& Name )
+        const OUString& Name )
     throw( com::sun::star::ucb::UnsupportedCommandException,
            uno::RuntimeException )
 {
@@ -326,7 +326,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
 //=========================================================================
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
-       const rtl::OUString& Name )
+       const OUString& Name )
     throw( uno::RuntimeException )
 {
     com::sun::star::ucb::CommandInfo aInfo;
@@ -358,7 +358,7 @@ void CommandProcessorInfo::reset()
 
 //=========================================================================
 sal_Bool CommandProcessorInfo::queryCommand(
-    const rtl::OUString& rName,
+    const OUString& rName,
     com::sun::star::ucb::CommandInfo& rCommand )
 {
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index acf2e73e512e..96f85778b2aa 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -775,7 +775,7 @@ InteractionSupplyAuthentication::canSetRealm()
 //=========================================================================
 // virtual
 void SAL_CALL
-InteractionSupplyAuthentication::setRealm( const rtl::OUString& Realm )
+InteractionSupplyAuthentication::setRealm( const OUString& Realm )
     throw( uno::RuntimeException )
 {
     OSL_ENSURE( m_bCanSetPassword,
@@ -797,7 +797,7 @@ InteractionSupplyAuthentication::canSetUserName()
 //=========================================================================
 // virtual
 void SAL_CALL
-InteractionSupplyAuthentication::setUserName( const rtl::OUString& UserName )
+InteractionSupplyAuthentication::setUserName( const OUString& UserName )
     throw( uno::RuntimeException )
 {
     OSL_ENSURE( m_bCanSetUserName,
@@ -819,7 +819,7 @@ InteractionSupplyAuthentication::canSetPassword()
 //=========================================================================
 // virtual
 void SAL_CALL
-InteractionSupplyAuthentication::setPassword( const rtl::OUString& Password )
+InteractionSupplyAuthentication::setPassword( const OUString& Password )
     throw( uno::RuntimeException )
 {
     OSL_ENSURE( m_bCanSetPassword,
@@ -862,7 +862,7 @@ InteractionSupplyAuthentication::canSetAccount()
 //=========================================================================
 // virtual
 void SAL_CALL
-InteractionSupplyAuthentication::setAccount( const rtl::OUString& Account )
+InteractionSupplyAuthentication::setAccount( const OUString& Account )
     throw( uno::RuntimeException )
 {
     OSL_ENSURE( m_bCanSetAccount,
@@ -1029,7 +1029,7 @@ void SAL_CALL InteractionSupplyName::select()
 
 // virtual
 void SAL_CALL
-InteractionSupplyName::setName( const rtl::OUString& Name )
+InteractionSupplyName::setName( const OUString& Name )
     throw( uno::RuntimeException )
 {
     m_aName = Name;
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 425f8024a5b3..3d8186f6a278 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -45,7 +45,6 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
-using ::rtl::OUString;
 
 namespace ucbhelper_impl
 {
@@ -79,7 +78,7 @@ const sal_uInt32 OBJECT_VALUE_SET           = 0x00040000;
 
 struct PropertyValue
 {
-    ::rtl::OUString
+    OUString
                 sPropertyName;
 
     sal_uInt32  nPropsSet;
@@ -636,42 +635,42 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
 }
 
 //=========================================================================
-void PropertyValueSet::appendString( const ::rtl::OUString& rPropName,
+void PropertyValueSet::appendString( const OUString& rPropName,
                                      const OUString& rValue )
 {
     SETVALUE_IMPL( rPropName, STRING_VALUE_SET, aString, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendBoolean( const ::rtl::OUString& rPropName,
+void PropertyValueSet::appendBoolean( const OUString& rPropName,
                                       sal_Bool bValue )
 {
     SETVALUE_IMPL( rPropName, BOOLEAN_VALUE_SET, bBoolean, bValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendLong( const ::rtl::OUString& rPropName,
+void PropertyValueSet::appendLong( const OUString& rPropName,
                                    sal_Int64 nValue )
 {
     SETVALUE_IMPL( rPropName, LONG_VALUE_SET, nLong, nValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendTimestamp( const ::rtl::OUString& rPropName,
+void PropertyValueSet::appendTimestamp( const OUString& rPropName,
                                         const DateTime& rValue )
 {
     SETVALUE_IMPL( rPropName, TIMESTAMP_VALUE_SET, aTimestamp, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendObject( const ::rtl::OUString& rPropName,
+void PropertyValueSet::appendObject( const OUString& rPropName,
                                      const Any& rValue )
 {
     SETVALUE_IMPL( rPropName, OBJECT_VALUE_SET, aObject, rValue );
 }
 
 //=========================================================================
-void PropertyValueSet::appendVoid( const ::rtl::OUString& rPropName )
+void PropertyValueSet::appendVoid( const OUString& rPropName )
 {
     SETVALUE_IMPL( rPropName, NO_VALUE_SET, aObject, Any() );
 }
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 5407df04d39c..28337b95219a 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -53,7 +53,7 @@ namespace ucbhelper_impl
 struct equalString
 {
     bool operator()(
-        const rtl::OUString& rKey11, const rtl::OUString& rKey22 ) const
+        const OUString& rKey11, const OUString& rKey22 ) const
       {
           return !!( rKey11 == rKey22 );
       }
@@ -61,7 +61,7 @@ struct equalString
 
 struct hashString
 {
-    size_t operator()( const rtl::OUString & rName ) const
+    size_t operator()( const OUString & rName ) const
     {
         return rName.hashCode();
     }
@@ -69,7 +69,7 @@ struct hashString
 
 typedef boost::unordered_map
 <
-    rtl::OUString,
+    OUString,
     uno::WeakReference< ucb::XContent >,
     hashString,
     equalString
@@ -146,11 +146,11 @@ XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
 
 // virtual
 sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
-                                            const rtl::OUString& ServiceName )
+                                            const OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
-    const rtl::OUString* pArray = aSNL.getConstArray();
+    uno::Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString* pArray = aSNL.getConstArray();
     for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
     {
         if ( pArray[ i ] == ServiceName )
@@ -174,8 +174,8 @@ sal_Int32 SAL_CALL ContentProviderImplHelper::compareContentIds(
 {
     // Simply do a string compare.
 
-    rtl::OUString aURL1( Id1->getContentIdentifier() );
-    rtl::OUString aURL2( Id2->getContentIdentifier() );
+    OUString aURL1( Id1->getContentIdentifier() );
+    OUString aURL2( Id2->getContentIdentifier() );
 
     return aURL1.compareTo( aURL2 );
 }
@@ -216,7 +216,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent )
 
     cleanupRegisteredContents();
 
-    const rtl::OUString aURL(
+    const OUString aURL(
         pContent->getIdentifier()->getContentIdentifier() );
 
     ucbhelper_impl::Contents::iterator it = m_pImpl->m_aContents.find( aURL );
@@ -236,7 +236,7 @@ ContentProviderImplHelper::queryExistingContent(
 
 //=========================================================================
 rtl::Reference< ContentImplHelper >
-ContentProviderImplHelper::queryExistingContent( const rtl::OUString& rURL )
+ContentProviderImplHelper::queryExistingContent( const OUString& rURL )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -294,7 +294,7 @@ void ContentProviderImplHelper::registerNewContent(
 
         cleanupRegisteredContents();
 
-        const rtl::OUString aURL(
+        const OUString aURL(
             xContent->getIdentifier()->getContentIdentifier() );
         ucbhelper_impl::Contents::const_iterator it
             = m_pImpl->m_aContents.find( aURL );
@@ -318,7 +318,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 
         // Open/create a registry.
         m_pImpl->m_xPropertySetRegistry
-            = xRegFac->createPropertySetRegistry( rtl::OUString() );
+            = xRegFac->createPropertySetRegistry( OUString() );
 
         OSL_ENSURE( m_pImpl->m_xPropertySetRegistry.is(),
                 "ContentProviderImplHelper::getAdditionalPropertySet - "
@@ -332,7 +332,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 //=========================================================================
 uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
 ContentProviderImplHelper::getAdditionalPropertySet(
-    const rtl::OUString& rKey, sal_Bool bCreate )
+    const OUString& rKey, sal_Bool bCreate )
 {
     // Get propertyset registry.
     getAdditionalPropertySetRegistry();
@@ -350,8 +350,8 @@ ContentProviderImplHelper::getAdditionalPropertySet(
 
 //=========================================================================
 sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
-    const rtl::OUString& rOldKey,
-    const rtl::OUString& rNewKey,
+    const OUString& rOldKey,
+    const OUString& rNewKey,
     sal_Bool bRecursive )
 {
     if ( rOldKey == rNewKey )
@@ -370,34 +370,34 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
                 m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
-                uno::Sequence< rtl::OUString > aKeys
+                uno::Sequence< OUString > aKeys
                     = xNameAccess->getElementNames();
                 sal_Int32 nCount = aKeys.getLength();
                 if ( nCount > 0 )
                 {
-                    rtl::OUString aOldKeyWithSlash = rOldKey;
-                    rtl::OUString aOldKeyWithoutSlash;
+                    OUString aOldKeyWithSlash = rOldKey;
+                    OUString aOldKeyWithoutSlash;
                     if ( aOldKeyWithSlash.lastIndexOf(
                              sal_Unicode('/')
                                  != aOldKeyWithSlash.getLength() - 1 ) )
                     {
-                        aOldKeyWithSlash += rtl::OUString( sal_Unicode('/') );
+                        aOldKeyWithSlash += OUString( sal_Unicode('/') );
                         aOldKeyWithoutSlash = rOldKey;
                     }
                     else if ( !rOldKey.isEmpty() )
                         aOldKeyWithoutSlash
                             = rOldKey.copy( 0, rOldKey.getLength() - 1 );
 
-                    const rtl::OUString* pKeys = aKeys.getConstArray();
+                    const OUString* pKeys = aKeys.getConstArray();
                     for ( sal_Int32 n = 0; n < nCount; ++n )
                     {
-                        const rtl::OUString& rKey = pKeys[ n ];
+                        const OUString& rKey = pKeys[ n ];
                         if ( rKey.compareTo(
                                  aOldKeyWithSlash,
                                  aOldKeyWithSlash.getLength() ) == 0
                              || rKey.equals( aOldKeyWithoutSlash ) )
                         {
-                            rtl::OUString aNewKey
+                            OUString aNewKey
                                 = rKey.replaceAt(
                                     0, rOldKey.getLength(), rNewKey );
                             if ( !renameAdditionalPropertySet(
@@ -437,8 +437,8 @@ sal_Bool ContentProviderImplHelper::renameAdditionalPropertySet(
 
 //=========================================================================
 sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
-    const rtl::OUString& rSourceKey,
-    const rtl::OUString& rTargetKey,
+    const OUString& rSourceKey,
+    const OUString& rTargetKey,
     sal_Bool bRecursive )
 {
     if ( rSourceKey == rTargetKey )
@@ -457,34 +457,34 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
                 m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
-                uno::Sequence< rtl::OUString > aKeys
+                uno::Sequence< OUString > aKeys
                     = xNameAccess->getElementNames();
                 sal_Int32 nCount = aKeys.getLength();
                 if ( nCount > 0 )
                 {
-                    rtl::OUString aSrcKeyWithSlash = rSourceKey;
-                    rtl::OUString aSrcKeyWithoutSlash;
+                    OUString aSrcKeyWithSlash = rSourceKey;
+                    OUString aSrcKeyWithoutSlash;
                     if ( aSrcKeyWithSlash.lastIndexOf(
                              sal_Unicode('/')
                              != aSrcKeyWithSlash.getLength() - 1 ) )
                     {
-                        aSrcKeyWithSlash += rtl::OUString( sal_Unicode('/') );
+                        aSrcKeyWithSlash += OUString( sal_Unicode('/') );
                         aSrcKeyWithoutSlash = rSourceKey;
                     }
                     else if ( !rSourceKey.isEmpty() )
                         aSrcKeyWithoutSlash = rSourceKey.copy(
                             0, rSourceKey.getLength() - 1 );
 
-                    const rtl::OUString* pKeys = aKeys.getConstArray();
+                    const OUString* pKeys = aKeys.getConstArray();
                     for ( sal_Int32 n = 0; n < nCount; ++n )
                     {
-                        const rtl::OUString& rKey = pKeys[ n ];
+                        const OUString& rKey = pKeys[ n ];
                         if ( rKey.compareTo(
                                  aSrcKeyWithSlash,
                                  aSrcKeyWithSlash.getLength() ) == 0
                              || rKey.equals( aSrcKeyWithoutSlash ) )
                         {
-                            rtl::OUString aNewKey
+                            OUString aNewKey
                                 = rKey.replaceAt(
                                     0, rSourceKey.getLength(), rTargetKey );
                             if ( !copyAdditionalPropertySet(
@@ -581,7 +581,7 @@ sal_Bool ContentProviderImplHelper::copyAdditionalPropertySet(
 
 //=========================================================================
 sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
-    const rtl::OUString& rKey, sal_Bool bRecursive )
+    const OUString& rKey, sal_Bool bRecursive )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -596,28 +596,28 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet(
                 m_pImpl->m_xPropertySetRegistry, uno::UNO_QUERY );
             if ( xNameAccess.is() )
             {
-                uno::Sequence< rtl::OUString > aKeys
+                uno::Sequence< OUString > aKeys
                     = xNameAccess->getElementNames();
                 sal_Int32 nCount = aKeys.getLength();
                 if ( nCount > 0 )
                 {
-                    rtl::OUString aKeyWithSlash = rKey;
-                    rtl::OUString aKeyWithoutSlash;
+                    OUString aKeyWithSlash = rKey;
+                    OUString aKeyWithoutSlash;
                     if ( aKeyWithSlash.lastIndexOf(
                              sal_Unicode('/')
                              != aKeyWithSlash.getLength() - 1 ) )
                     {
-                        aKeyWithSlash += rtl::OUString( (sal_Unicode)'/' );
+                        aKeyWithSlash += OUString( (sal_Unicode)'/' );
                         aKeyWithoutSlash = rKey;
                     }
                     else if ( !rKey.isEmpty() )
                         aKeyWithoutSlash
                             = rKey.copy( 0, rKey.getLength() - 1 );
 
-                    const rtl::OUString* pKeys = aKeys.getConstArray();
+                    const OUString* pKeys = aKeys.getConstArray();
                     for ( sal_Int32 n = 0; n < nCount; ++n )
                     {
-                        const rtl::OUString& rCurrKey = pKeys[ n ];
+                        const OUString& rCurrKey = pKeys[ n ];
                         if ( rCurrKey.compareTo(
                                  aKeyWithSlash,
                                  aKeyWithSlash.getLength() ) == 0
diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index 33dd0c21f8ee..944fe01f1abc 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -43,9 +43,9 @@ bool
 registerAtUcb(
     uno::Reference< ucb::XContentProviderManager > const & rManager,
     uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory,
-    rtl::OUString const & rName,
-    rtl::OUString const & rArguments,
-    rtl::OUString const & rTemplate,
+    OUString const & rName,
+    OUString const & rArguments,
+    OUString const & rTemplate,
     ContentProviderRegistrationInfo * pInfo)
     throw (uno::RuntimeException)
 {
@@ -53,7 +53,7 @@ registerAtUcb(
                "ucb::registerAtUcb(): No service factory");
 
     bool bNoProxy = rArguments.startsWith("{noproxy}");
-    rtl::OUString
+    OUString
         aProviderArguments(bNoProxy ?
                                rArguments.
                                    copy(RTL_CONSTASCII_LENGTH("{noproxy}")) :
@@ -68,7 +68,7 @@ registerAtUcb(
         {
             uno::Reference< beans::XPropertySet > xFactoryProperties( rServiceFactory, uno::UNO_QUERY_THROW );
             uno::Reference< uno::XComponentContext > xContext = uno::Reference< uno::XComponentContext >(
-                xFactoryProperties->getPropertyValue( ::rtl::OUString( "DefaultContext" ) ),
+                xFactoryProperties->getPropertyValue( OUString( "DefaultContext" ) ),
                 uno::UNO_QUERY );
             xProxyFactory
                 = uno::Reference< ucb::XContentProviderFactory >(
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 77409602b7df..858ebbad77d3 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -90,7 +90,7 @@ class PropertySetInfo :
 
 private:
     sal_Bool queryProperty(
-        const rtl::OUString& aName, beans::Property& rProp );
+        const OUString& aName, beans::Property& rProp );
 
 public:
     PropertySetInfo(
@@ -108,9 +108,9 @@ public:
     virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
         throw( uno::RuntimeException );
     virtual beans::Property SAL_CALL getPropertyByName(
-            const rtl::OUString& aName )
+            const OUString& aName )
         throw( beans::UnknownPropertyException, uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasPropertyByName( const rtl::OUString& Name )
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
         throw( uno::RuntimeException );
 };
 
@@ -122,7 +122,7 @@ public:
 
 struct equalStr_Impl
 {
-    bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const
+    bool operator()( const OUString& s1, const OUString& s2 ) const
       {
         return !!( s1 == s2 );
     }
@@ -130,7 +130,7 @@ struct equalStr_Impl
 
 struct hashStr_Impl
 {
-    size_t operator()( const rtl::OUString& rName ) const
+    size_t operator()( const OUString& rName ) const
     {
         return rName.hashCode();
     }
@@ -138,7 +138,7 @@ struct hashStr_Impl
 
 typedef cppu::OMultiTypeInterfaceContainerHelperVar
 <
-    rtl::OUString,
+    OUString,
     hashStr_Impl,
     equalStr_Impl
 > PropertyChangeListenerContainer;
@@ -297,8 +297,8 @@ XTYPEPROVIDER_IMPL_9( ResultSet,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet,
-                    rtl::OUString("ResultSet"),
-                    rtl::OUString(RESULTSET_SERVICE_NAME ) );
+                    OUString("ResultSet"),
+                    OUString(RESULTSET_SERVICE_NAME ) );
 
 //=========================================================================
 //
@@ -810,7 +810,7 @@ sal_Bool SAL_CALL ResultSet::wasNull()
 
 //=========================================================================
 // virtual
-rtl::OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
+OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
     throw( sdbc::SQLException, uno::RuntimeException )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
@@ -828,7 +828,7 @@ rtl::OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
 
     m_pImpl->m_bWasNull = sal_True;
     m_pImpl->m_xDataSupplier->validate();
-    return rtl::OUString();
+    return OUString();
 }
 
 //=========================================================================
@@ -1276,14 +1276,14 @@ void SAL_CALL ResultSet::close()
 //=========================================================================
 
 // virtual
-rtl::OUString SAL_CALL ResultSet::queryContentIdentifierString()
+OUString SAL_CALL ResultSet::queryContentIdentifierString()
     throw( uno::RuntimeException )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContentIdentifierString(
                                                         m_pImpl->m_nPos - 1 );
 
-    return rtl::OUString();
+    return OUString();
 }
 
 //=========================================================================
@@ -1333,7 +1333,7 @@ ResultSet::getPropertySetInfo()
 
 //=========================================================================
 // virtual
-void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName,
+void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
                                            const uno::Any& )
     throw( beans::UnknownPropertyException,
            beans::PropertyVetoException,
@@ -1345,13 +1345,13 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName,
         throw beans::UnknownPropertyException();
 
     if ( aPropertyName.equals(
-                rtl::OUString("RowCount") ) )
+                OUString("RowCount") ) )
     {
         // property is read-only.
         throw lang::IllegalArgumentException();
     }
     else if ( aPropertyName.equals(
-                rtl::OUString("IsRowCountFinal") ) )
+                OUString("IsRowCountFinal") ) )
     {
         // property is read-only.
         throw lang::IllegalArgumentException();
@@ -1365,7 +1365,7 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName,
 //=========================================================================
 // virtual
 uno::Any SAL_CALL ResultSet::getPropertyValue(
-        const rtl::OUString& PropertyName )
+        const OUString& PropertyName )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
            uno::RuntimeException )
@@ -1376,12 +1376,12 @@ uno::Any SAL_CALL ResultSet::getPropertyValue(
     uno::Any aValue;
 
     if ( PropertyName.equals(
-                rtl::OUString("RowCount") ) )
+                OUString("RowCount") ) )
     {
         aValue <<= m_pImpl->m_xDataSupplier->currentCount();
     }
     else if ( PropertyName.equals(
-                rtl::OUString("IsRowCountFinal") ) )
+                OUString("IsRowCountFinal") ) )
     {
         aValue <<= m_pImpl->m_xDataSupplier->isCountFinal();
     }
@@ -1396,7 +1396,7 @@ uno::Any SAL_CALL ResultSet::getPropertyValue(
 //=========================================================================
 // virtual
 void SAL_CALL ResultSet::addPropertyChangeListener(
-        const rtl::OUString& aPropertyName,
+        const OUString& aPropertyName,
         const uno::Reference< beans::XPropertyChangeListener >& xListener )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
@@ -1408,9 +1408,9 @@ void SAL_CALL ResultSet::addPropertyChangeListener(
 
     if ( !aPropertyName.isEmpty() &&
          !aPropertyName.equals(
-                rtl::OUString("RowCount") ) &&
+                OUString("RowCount") ) &&
          !aPropertyName.equals(
-                rtl::OUString("IsRowCountFinal") ) )
+                OUString("IsRowCountFinal") ) )
         throw beans::UnknownPropertyException();
 
     if ( !m_pImpl->m_pPropertyChangeListeners )
@@ -1424,7 +1424,7 @@ void SAL_CALL ResultSet::addPropertyChangeListener(
 //=========================================================================
 // virtual
 void SAL_CALL ResultSet::removePropertyChangeListener(
-        const rtl::OUString& aPropertyName,
+        const OUString& aPropertyName,
         const uno::Reference< beans::XPropertyChangeListener >& xListener )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
@@ -1434,9 +1434,9 @@ void SAL_CALL ResultSet::removePropertyChangeListener(
 
     if ( !aPropertyName.isEmpty() &&
          !aPropertyName.equals(
-                rtl::OUString("RowCount") ) &&
+                OUString("RowCount") ) &&
          !aPropertyName.equals(
-                rtl::OUString("IsRowCountFinal") ) )
+                OUString("IsRowCountFinal") ) )
         throw beans::UnknownPropertyException();
 
     if ( m_pImpl->m_pPropertyChangeListeners )
@@ -1448,7 +1448,7 @@ void SAL_CALL ResultSet::removePropertyChangeListener(
 //=========================================================================
 // virtual
 void SAL_CALL ResultSet::addVetoableChangeListener(
-        const rtl::OUString&,
+        const OUString&,
         const uno::Reference< beans::XVetoableChangeListener >& )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
@@ -1460,7 +1460,7 @@ void SAL_CALL ResultSet::addVetoableChangeListener(
 //=========================================================================
 // virtual
 void SAL_CALL ResultSet::removeVetoableChangeListener(
-        const rtl::OUString&,
+        const OUString&,
         const uno::Reference< beans::XVetoableChangeListener >& )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
@@ -1498,7 +1498,7 @@ void ResultSet::propertyChanged( const beans::PropertyChangeEvent& rEvt )
 
     // Notify listeners interested in all properties.
     pPropsContainer
-        = m_pImpl->m_pPropertyChangeListeners->getContainer( rtl::OUString() );
+        = m_pImpl->m_pPropertyChangeListeners->getContainer( OUString() );
     if ( pPropsContainer )
     {
         cppu::OInterfaceIteratorHelper aIter( *pPropsContainer );
@@ -1523,7 +1523,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew )
     propertyChanged(
         beans::PropertyChangeEvent(
             static_cast< cppu::OWeakObject * >( this ),
-            rtl::OUString("RowCount"),
+            OUString("RowCount"),
             sal_False,
             1001,
             uno::makeAny( nOld ),     // old value
@@ -1539,7 +1539,7 @@ void ResultSet::rowCountFinal()
     propertyChanged(
         beans::PropertyChangeEvent(
             static_cast< cppu::OWeakObject * >( this ),
-            rtl::OUString("IsRowCountFinal"),
+            OUString("IsRowCountFinal"),
             sal_False,
             1000,
             uno:: makeAny( sal_False ),   // old value
@@ -1586,7 +1586,7 @@ PropertySetInfo::PropertySetInfo(
         {
             beans::Property& rProp = pProperties[ n ];
 
-            rProp.Name       = rtl::OUString::createFromAscii( pEntry->pName );
+            rProp.Name       = OUString::createFromAscii( pEntry->pName );
             rProp.Handle     = pEntry->nHandle;
             rProp.Type       = pEntry->pGetCppuType();
             rProp.Attributes = pEntry->nAttributes;
@@ -1639,7 +1639,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 //=========================================================================
 // virtual
 beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
-        const rtl::OUString& aName )
+        const OUString& aName )
     throw( beans::UnknownPropertyException, uno::RuntimeException )
 {
     beans::Property aProp;
@@ -1652,7 +1652,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 //=========================================================================
 // virtual
 sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
-        const rtl::OUString& Name )
+        const OUString& Name )
     throw( uno::RuntimeException )
 {
     beans::Property aProp;
@@ -1661,7 +1661,7 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
 
 //=========================================================================
 sal_Bool PropertySetInfo::queryProperty(
-    const rtl::OUString& aName, beans::Property& rProp )
+    const OUString& aName, beans::Property& rProp )
 {
     sal_Int32 nCount = m_pProps->getLength();
     const beans::Property* pProps = m_pProps->getConstArray();
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 7b3372111e8c..53a667b3c6c5 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -97,9 +97,9 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
 //=========================================================================
 
 XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper,
-                               rtl::OUString(
+                               OUString(
                                    "ResultSetImplHelper" ),
-                               rtl::OUString(
+                               OUString(
                                    DYNAMICRESULTSET_SERVICE_NAME ) );
 
 //=========================================================================
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 13e94ed2cc92..8329c2c86dc1 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
 
-using ::rtl::OUString;
 
 namespace ucbhelper_impl {
 
@@ -443,7 +442,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
     const Type& rType = m_aProps.getConstArray()[ column - 1 ].Type;
     sal_Int32 nType = DataType::OTHER;
 
-    if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) )
+    if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) )
         nType = DataType::VARCHAR;  // XRow::getString
     else if ( rType == getCppuBooleanType() )
         nType = DataType::BIT;      // XRow::getBoolean
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index afe43e9e08c5..b66980f2422b 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -26,12 +26,12 @@ using namespace ucbhelper;
 
 //=========================================================================
 SimpleAuthenticationRequest::SimpleAuthenticationRequest(
-                                      const rtl::OUString & rURL,
-                                      const rtl::OUString & rServerName,
-                                      const rtl::OUString & rRealm,
-                                      const rtl::OUString & rUserName,
-                                      const rtl::OUString & rPassword,
-                                      const rtl::OUString & rAccount,
+                                      const OUString & rURL,
+                                      const OUString & rServerName,
+                                      const OUString & rRealm,
+                                      const OUString & rUserName,
+                                      const OUString & rPassword,
+                                      const OUString & rAccount,
                                       sal_Bool bAllowPersistentStoring,
                                       sal_Bool bAllowUseSystemCredentials )
 {
@@ -66,16 +66,16 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
 
 //=========================================================================
 SimpleAuthenticationRequest::SimpleAuthenticationRequest(
-                                      const rtl::OUString & rURL,
-                                      const rtl::OUString & rServerName,
+                                      const OUString & rURL,
+                                      const OUString & rServerName,
                                       EntityType eRealmType,
-                                      const rtl::OUString & rRealm,
+                                      const OUString & rRealm,
                                       EntityType eUserNameType,
-                                      const rtl::OUString & rUserName,
+                                      const OUString & rUserName,
                                       EntityType ePasswordType,
-                                      const rtl::OUString & rPassword,
+                                      const OUString & rPassword,
                                       EntityType eAccountType,
-                                      const rtl::OUString & rAccount )
+                                      const OUString & rAccount )
 {
     // Fill request...
     ucb::URLAuthenticationRequest aRequest;
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index d404b2eb3f07..f80e4bf1cd07 100644
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
@@ -26,7 +26,7 @@ using namespace ucbhelper;
 //=========================================================================
 SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity,
                                                                         const com::sun::star::uno::Reference<com::sun::star::security::XCertificate> pCertificate,
-                                                                        const rtl::OUString & hostname)
+                                                                        const OUString & hostname)
 {
     // Fill request...
     ucb::CertificateValidationRequest aRequest;
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx
index a23d02868750..fd859fa5c7eb 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.cxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx
@@ -27,7 +27,7 @@ using namespace ucbhelper;
 SimpleIOErrorRequest::SimpleIOErrorRequest(
                 const ucb::IOErrorCode eError,
                 const uno::Sequence< uno::Any > & rArgs,
-                const rtl::OUString & rMessage,
+                const OUString & rMessage,
                 const uno::Reference< ucb::XCommandProcessor > & xContext )
 {
     // Fill request...
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 440104413c5f..fe7e42d2cebf 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -25,9 +25,9 @@ using namespace ucbhelper;
 
 //=========================================================================
 SimpleNameClashResolveRequest::SimpleNameClashResolveRequest(
-                                    const rtl::OUString & rTargetFolderURL,
-                                    const rtl::OUString & rClashingName,
-                                    const rtl::OUString & rProposedNewName,
+                                    const OUString & rTargetFolderURL,
+                                    const OUString & rClashingName,
+                                    const OUString & rProposedNewName,
                                     sal_Bool bSupportsOverwriteData )
 {
     // Fill request...