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

36 files changed, 417 insertions, 420 deletions

diff --git a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
index c5e415b4c55b..67e000b33fb3 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
@@ -92,7 +92,7 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOEr
                              const com::sun::star::uno::Reference<
                                 com::sun::star::ucb::XCommandEnvironment > &
                                     xEnv,
-                             const rtl::OUString & rMessage = rtl::OUString(),
+                             const OUString & rMessage = OUString(),
                              const com::sun::star::uno::Reference<
                                 com::sun::star::ucb::XCommandProcessor > &
                                     xContext = 0 )
diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 3cdee465bda0..0c5a2b45db5b 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.hxx
@@ -100,7 +100,7 @@ class UCBHELPER_DLLPUBLIC Content
 
 protected:
     ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
-                                                rtl::OUString >& rPropertyNames,
+                                                OUString >& rPropertyNames,
                                                 ResultSetInclude eMode )
             throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -121,7 +121,7 @@ public:
       *        implementation to interact with the client and to propagate
       *        errors.
       */
-    Content( const rtl::OUString& rURL,
+    Content( const OUString& rURL,
              const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
              const ::com::sun::star::uno::Reference<
@@ -178,7 +178,7 @@ public:
       * @return true, if the operation was successful - false, otherwise.
       */
     static sal_Bool
-    create( const rtl::OUString& rURL,
+    create( const OUString& rURL,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
             const ::com::sun::star::uno::Reference<
@@ -210,7 +210,7 @@ public:
       *
       * @return the URL of the content.
       */
-    const ::rtl::OUString& getURL() const;
+    const OUString& getURL() const;
 
     //////////////////////////////////////////////////////////////////////
     // Command environment.
@@ -276,7 +276,7 @@ public:
       * @return the property value.
       */
     ::com::sun::star::uno::Any
-    getPropertyValue( const rtl::OUString& rPropertyName )
+    getPropertyValue( const OUString& rPropertyName )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -305,7 +305,7 @@ public:
       *           com::sun::star::ucb::IOErrorCode::ACCESS_DENIED.
       */
     ::com::sun::star::uno::Any
-    setPropertyValue( const rtl::OUString& rPropertyName,
+    setPropertyValue( const OUString& rPropertyName,
                       const ::com::sun::star::uno::Any& rValue )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -319,7 +319,7 @@ public:
       */
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
     getPropertyValues( const ::com::sun::star::uno::Sequence<
-                                rtl::OUString >& rPropertyNames )
+                                OUString >& rPropertyNames )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -332,7 +332,7 @@ public:
       */
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
     getPropertyValuesInterface( const ::com::sun::star::uno::Sequence<
-                                rtl::OUString >& rPropertyNames )
+                                OUString >& rPropertyNames )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -369,7 +369,7 @@ public:
       */
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
     setPropertyValues( const ::com::sun::star::uno::Sequence<
-                                rtl::OUString >& rPropertyNames,
+                                OUString >& rPropertyNames,
                        const ::com::sun::star::uno::Sequence<
                                     ::com::sun::star::uno::Any >& rValues )
         throw( ::com::sun::star::ucb::CommandAbortedException,
@@ -391,7 +391,7 @@ public:
       * @return the result of the command according to its specification.
       */
     ::com::sun::star::uno::Any
-    executeCommand( const rtl::OUString& rCommandName,
+    executeCommand( const OUString& rCommandName,
                     const ::com::sun::star::uno::Any& rCommandArgument )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -418,7 +418,7 @@ public:
       */
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
     createCursor( const ::com::sun::star::uno::Sequence<
-                                rtl::OUString >& rPropertyNames,
+                                OUString >& rPropertyNames,
                   ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -440,7 +440,7 @@ public:
       */
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet >
     createDynamicCursor( const ::com::sun::star::uno::Sequence<
-                         rtl::OUString >& rPropertyNames,
+                         OUString >& rPropertyNames,
                          ResultSetInclude eMode
                             = INCLUDE_FOLDERS_AND_DOCUMENTS )
         throw( ::com::sun::star::ucb::CommandAbortedException,
@@ -448,7 +448,7 @@ public:
                ::com::sun::star::uno::Exception );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
-    createSortedCursor( const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
+    createSortedCursor( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames,
                         const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
                         ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory,
                         ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS )
@@ -595,9 +595,9 @@ public:
       *        with the new content.
       */
     sal_Bool
-    insertNewContent( const ::rtl::OUString& rContentType,
+    insertNewContent( const OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
-                        rtl::OUString >& rPropertyNames,
+                        OUString >& rPropertyNames,
                       const ::com::sun::star::uno::Sequence<
                         ::com::sun::star::uno::Any >& rPropertyValues,
                       Content& rNewContent )
@@ -631,9 +631,9 @@ public:
       *        with the new content.
       */
     sal_Bool
-    insertNewContent( const ::rtl::OUString& rContentType,
+    insertNewContent( const OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
-                        rtl::OUString >& rPropertyNames,
+                        OUString >& rPropertyNames,
                       const ::com::sun::star::uno::Sequence<
                         ::com::sun::star::uno::Any >& rPropertyValues,
                       const ::com::sun::star::uno::Reference<
@@ -674,12 +674,12 @@ public:
     sal_Bool
     transferContent( const Content& rSourceContent,
                      InsertOperation eOperation,
-                     const ::rtl::OUString & rTitle,
+                     const OUString & rTitle,
                      const sal_Int32 nNameClashAction,
-                     const ::rtl::OUString & rMimeType = ::rtl::OUString( ),
+                     const OUString & rMimeType = OUString( ),
                      bool bMajorVersion = false,
-                     const ::rtl::OUString & rCommentVersion = ::rtl::OUString( ),
-                     ::rtl::OUString* pResultURL = NULL )
+                     const OUString & rCommentVersion = OUString( ),
+                     OUString* pResultURL = NULL )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx
index 72049d76290b..e903d97f193a 100644
--- a/ucbhelper/inc/ucbhelper/contenthelper.hxx
+++ b/ucbhelper/inc/ucbhelper/contenthelper.hxx
@@ -148,7 +148,7 @@ private:
       *         be returned. If your content has more than one parent you may
       *         return the URL of one "preferred" parent or an empty string.
       */
-    UCBHELPER_DLLPRIVATE virtual ::rtl::OUString getParentURL() = 0;
+    UCBHELPER_DLLPRIVATE virtual OUString getParentURL() = 0;
 
 protected:
     /**
@@ -266,8 +266,8 @@ protected:
       *         children described by rOldKey shall be renamed too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool renameAdditionalPropertySet( const ::rtl::OUString& rOldKey,
-                                          const ::rtl::OUString& rNewKey,
+    sal_Bool renameAdditionalPropertySet( const OUString& rOldKey,
+                                          const OUString& rNewKey,
                                           sal_Bool bRecursive );
 
     /**
@@ -280,8 +280,8 @@ protected:
       *         children described by rSourceKey shall be copied too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool copyAdditionalPropertySet( const ::rtl::OUString& rSourceKey,
-                                        const ::rtl::OUString& rTargetKey,
+    sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey,
+                                        const OUString& rTargetKey,
                                         sal_Bool bRecursive );
 
     /**
@@ -330,13 +330,13 @@ public:
     XTYPEPROVIDER_DECL()
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getImplementationName()
         throw( ::com::sun::star::uno::RuntimeException ) = 0;
     virtual sal_Bool SAL_CALL
-    supportsService( const ::rtl::OUString& ServiceName )
+    supportsService( const OUString& ServiceName )
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
         throw( ::com::sun::star::uno::RuntimeException ) = 0;
 
@@ -358,7 +358,7 @@ public:
                 com::sun::star::ucb::XContentIdentifier > SAL_CALL
     getIdentifier()
         throw( com::sun::star::uno::RuntimeException );
-    virtual rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getContentType()
         throw( com::sun::star::uno::RuntimeException ) = 0;
     virtual void SAL_CALL
@@ -391,13 +391,13 @@ public:
     // XPropertiesChangeNotifier
     virtual void SAL_CALL
     addPropertiesChangeListener(
-        const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames,
+        const com::sun::star::uno::Sequence< OUString >& PropertyNames,
          const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener >& Listener )
         throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
     removePropertiesChangeListener(
-        const com::sun::star::uno::Sequence< rtl::OUString >& PropertyNames,
+        const com::sun::star::uno::Sequence< OUString >& PropertyNames,
         const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener >& Listener )
         throw( com::sun::star::uno::RuntimeException );
@@ -427,7 +427,7 @@ public:
       * implementation of getPropertyInfoTable.
       */
     virtual void SAL_CALL
-    addProperty( const rtl::OUString& Name,
+    addProperty( const OUString& Name,
                  sal_Int16 Attributes,
                  const com::sun::star::uno::Any& DefaultValue )
         throw( com::sun::star::beans::PropertyExistException,
@@ -446,7 +446,7 @@ public:
       * implementation of getPropertyInfoTable.
       */
     virtual void SAL_CALL
-    removeProperty( const rtl::OUString& Name )
+    removeProperty( const OUString& Name )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::beans::NotRemoveableException,
                com::sun::star::uno::RuntimeException );
diff --git a/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
index 31f0a276ea36..89573d52cc73 100644
--- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx
+++ b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
@@ -48,7 +48,7 @@ class UCBHELPER_DLLPUBLIC ContentIdentifier :
                   public com::sun::star::ucb::XContentIdentifier
 {
 public:
-    ContentIdentifier( const rtl::OUString& rURL );
+    ContentIdentifier( const OUString& rURL );
     virtual ~ContentIdentifier();
 
     // XInterface
@@ -69,10 +69,10 @@ public:
         throw( com::sun::star::uno::RuntimeException );
 
     // XContentIdentifier
-    virtual rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getContentIdentifier()
         throw( com::sun::star::uno::RuntimeException );
-    virtual rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getContentProviderScheme()
         throw( com::sun::star::uno::RuntimeException );
 
diff --git a/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx
index 77dcd5850e58..347c86304359 100644
--- a/ucbhelper/inc/ucbhelper/contentinfo.hxx
+++ b/ucbhelper/inc/ucbhelper/contentinfo.hxx
@@ -58,7 +58,7 @@ class PropertySetInfo :
     ContentImplHelper*          m_pContent;
 
 private:
-    sal_Bool queryProperty( const rtl::OUString& rName,
+    sal_Bool queryProperty( const OUString& rName,
                             com::sun::star::beans::Property& rProp );
 
 public:
@@ -79,11 +79,11 @@ public:
     getProperties()
         throw( com::sun::star::uno::RuntimeException );
     virtual com::sun::star::beans::Property SAL_CALL
-    getPropertyByName( const rtl::OUString& aName )
+    getPropertyByName( const OUString& aName )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL
-    hasPropertyByName( const rtl::OUString& Name )
+    hasPropertyByName( const OUString& Name )
         throw( com::sun::star::uno::RuntimeException );
 
     // Non-Interface methods.
@@ -114,7 +114,7 @@ class CommandProcessorInfo :
     ContentImplHelper*          m_pContent;
 
 private:
-    sal_Bool queryCommand( const rtl::OUString& rName,
+    sal_Bool queryCommand( const OUString& rName,
                            com::sun::star::ucb::CommandInfo& rCommand );
     sal_Bool queryCommand( sal_Int32 nHandle,
                            com::sun::star::ucb::CommandInfo& rCommand );
@@ -137,7 +137,7 @@ public:
     getCommands()
         throw( com::sun::star::uno::RuntimeException );
     virtual com::sun::star::ucb::CommandInfo SAL_CALL
-    getCommandInfoByName( const rtl::OUString& Name )
+    getCommandInfoByName( const OUString& Name )
         throw( com::sun::star::ucb::UnsupportedCommandException,
         com::sun::star::uno::RuntimeException );
     virtual com::sun::star::ucb::CommandInfo SAL_CALL
@@ -145,7 +145,7 @@ public:
         throw( com::sun::star::ucb::UnsupportedCommandException,
         com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL
-    hasCommandByName( const rtl::OUString& Name )
+    hasCommandByName( const OUString& Name )
         throw( com::sun::star::uno::RuntimeException );
     virtual sal_Bool SAL_CALL
     hasCommandByHandle( sal_Int32 Handle )
diff --git a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
index b044c31db7c8..40c23045e5d4 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
@@ -43,7 +43,7 @@ namespace ucbhelper {
     either a 'root' URL for the most 'local' file content provider, or an
     empty string, if no such URL can meaningfully be constructed.
  */
-UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL()
+UCBHELPER_DLLPUBLIC OUString getLocalFileURL()
     SAL_THROW((com::sun::star::uno::RuntimeException));
 
 //============================================================================
@@ -70,13 +70,13 @@ UCBHELPER_DLLPUBLIC rtl::OUString getLocalFileURL()
     @see
     com::sun::star::ucb::XFileIdentiferConverter::getFileURLFromSystemPath().
  */
-UCBHELPER_DLLPUBLIC rtl::OUString
+UCBHELPER_DLLPUBLIC OUString
 getFileURLFromSystemPath(
     com::sun::star::uno::Reference<
             com::sun::star::ucb::XUniversalContentBroker > const &
         rUcb,
-    rtl::OUString const & rBaseURL,
-    rtl::OUString const & rSystemPath)
+    OUString const & rBaseURL,
+    OUString const & rSystemPath)
     SAL_THROW((com::sun::star::uno::RuntimeException));
 
 //============================================================================
@@ -100,12 +100,12 @@ getFileURLFromSystemPath(
     @see
     com::sun::star::ucb::XFileIdentiferConverter::getSystemPathFromFileURL().
  */
-UCBHELPER_DLLPUBLIC rtl::OUString
+UCBHELPER_DLLPUBLIC OUString
 getSystemPathFromFileURL(
     com::sun::star::uno::Reference<
             com::sun::star::ucb::XUniversalContentBroker > const &
         rUcb,
-    rtl::OUString const & rURL)
+    OUString const & rURL)
     SAL_THROW((com::sun::star::uno::RuntimeException));
 
 }
diff --git a/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
index 5a8b3d545cf8..6de19931238c 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
@@ -337,10 +337,10 @@ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication :
                   m_aRememberPasswordModes;
     com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication >
                   m_aRememberAccountModes;
-    rtl::OUString m_aRealm;
-    rtl::OUString m_aUserName;
-    rtl::OUString m_aPassword;
-    rtl::OUString m_aAccount;
+    OUString m_aRealm;
+    OUString m_aUserName;
+    OUString m_aPassword;
+    OUString m_aAccount;
     com::sun::star::ucb::RememberAuthentication m_eRememberPasswordMode;
     com::sun::star::ucb::RememberAuthentication m_eDefaultRememberPasswordMode;
     com::sun::star::ucb::RememberAuthentication m_eRememberAccountMode;
@@ -454,21 +454,21 @@ public:
     canSetRealm()
         throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    setRealm( const rtl::OUString& Realm )
+    setRealm( const OUString& Realm )
         throw( com::sun::star::uno::RuntimeException );
 
     virtual sal_Bool SAL_CALL
     canSetUserName()
         throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    setUserName( const rtl::OUString& UserName )
+    setUserName( const OUString& UserName )
         throw( com::sun::star::uno::RuntimeException );
 
     virtual sal_Bool SAL_CALL
     canSetPassword()
         throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    setPassword( const rtl::OUString& Password )
+    setPassword( const OUString& Password )
         throw( com::sun::star::uno::RuntimeException );
 
     virtual com::sun::star::uno::Sequence<
@@ -484,7 +484,7 @@ public:
     canSetAccount()
         throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    setAccount( const rtl::OUString& Account )
+    setAccount( const OUString& Account )
         throw( com::sun::star::uno::RuntimeException );
 
     virtual com::sun::star::uno::Sequence<
@@ -510,7 +510,7 @@ public:
       *
       * @return the realm.
       */
-    const rtl::OUString & getRealm()    const { return m_aRealm; }
+    const OUString & getRealm()    const { return m_aRealm; }
 
     /**
       * This method returns the username that was supplied by the interaction
@@ -518,7 +518,7 @@ public:
       *
       * @return the username.
       */
-    const rtl::OUString & getUserName() const { return m_aUserName; }
+    const OUString & getUserName() const { return m_aUserName; }
 
     /**
       * This method returns the password that was supplied by the interaction
@@ -526,7 +526,7 @@ public:
       *
       * @return the password.
       */
-    const rtl::OUString & getPassword() const { return m_aPassword; }
+    const OUString & getPassword() const { return m_aPassword; }
 
     /**
       * This method returns the account that was supplied by the interaction
@@ -534,7 +534,7 @@ public:
       *
       * @return the account.
       */
-    const rtl::OUString & getAccount()  const { return m_aAccount; }
+    const OUString & getAccount()  const { return m_aAccount; }
 
     /**
       * This method returns the authentication remember-mode for the password
@@ -634,7 +634,7 @@ class InteractionSupplyName : public InteractionContinuation,
                               public com::sun::star::lang::XTypeProvider,
                               public com::sun::star::ucb::XInteractionSupplyName
 {
-    rtl::OUString m_aName;
+    OUString m_aName;
 
 public:
     InteractionSupplyName( InteractionRequest * pRequest )
@@ -662,7 +662,7 @@ public:
         throw( com::sun::star::uno::RuntimeException );
 
     // XInteractionSupplyName
-    virtual void SAL_CALL setName( const ::rtl::OUString& Name )
+    virtual void SAL_CALL setName( const OUString& Name )
         throw ( com::sun::star::uno::RuntimeException );
 
     // Non-interface methods.
@@ -673,7 +673,7 @@ public:
       *
       * @return the name.
       */
-    const rtl::OUString & getName() const { return m_aName; }
+    const OUString & getName() const { return m_aName; }
 };
 
 //============================================================================
diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx
index 386f8f1909ba..2f31e3098545 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/ucbhelper/inc/ucbhelper/macros.hxx
@@ -580,19 +580,19 @@ GETTYPES_IMPL_END
 //=========================================================================
 
 #define XSERVICEINFO_NOFACTORY_DECL()                                       \
-    virtual rtl::OUString SAL_CALL                                          \
+    virtual OUString SAL_CALL                                          \
     getImplementationName()                                                 \
         throw( com::sun::star::uno::RuntimeException );                     \
     virtual sal_Bool SAL_CALL                                               \
-    supportsService( const rtl::OUString& ServiceName )                     \
+    supportsService( const OUString& ServiceName )                     \
         throw( com::sun::star::uno::RuntimeException );                     \
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL         \
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL         \
     getSupportedServiceNames()                                              \
         throw( com::sun::star::uno::RuntimeException );                     \
                                                                             \
-    static rtl::OUString                                                    \
+    static OUString                                                    \
     getImplementationName_Static();                                         \
-    static com::sun::star::uno::Sequence< rtl::OUString >                   \
+    static com::sun::star::uno::Sequence< OUString >                   \
     getSupportedServiceNames_Static();
 
 #define XSERVICEINFO_DECL()                                                 \
@@ -610,24 +610,24 @@ GETTYPES_IMPL_END
 //=========================================================================
 
 #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                         \
-rtl::OUString SAL_CALL Class::getImplementationName()                       \
+OUString SAL_CALL Class::getImplementationName()                       \
     throw( com::sun::star::uno::RuntimeException )                          \
 {                                                                           \
     return getImplementationName_Static();                                  \
 }                                                                           \
                                                                             \
-rtl::OUString Class::getImplementationName_Static()                         \
+OUString Class::getImplementationName_Static()                         \
 {                                                                           \
     return ImplName;                                                        \
 }                                                                           \
                                                                             \
 sal_Bool SAL_CALL                                                           \
-Class::supportsService( const rtl::OUString& ServiceName )                  \
+Class::supportsService( const OUString& ServiceName )                  \
     throw( com::sun::star::uno::RuntimeException )                          \
 {                                                                           \
-    com::sun::star::uno::Sequence< rtl::OUString > aSNL =                   \
+    com::sun::star::uno::Sequence< OUString > aSNL =                   \
                                         getSupportedServiceNames();         \
-    const rtl::OUString* pArray = aSNL.getArray();                          \
+    const OUString* pArray = aSNL.getArray();                          \
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )                       \
     {                                                                       \
         if( pArray[ i ] == ServiceName )                                    \
@@ -637,7 +637,7 @@ Class::supportsService( const rtl::OUString& ServiceName )                  \
     return sal_False;                                                       \
 }                                                                           \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL                     \
+com::sun::star::uno::Sequence< OUString > SAL_CALL                     \
 Class::getSupportedServiceNames()                                           \
     throw( com::sun::star::uno::RuntimeException )                          \
 {                                                                           \
@@ -697,17 +697,17 @@ Class::createServiceFactory( const com::sun::star::uno::Reference<          \
 #define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName )                    \
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString >                              \
+com::sun::star::uno::Sequence< OUString >                              \
 Class::getSupportedServiceNames_Static()
 
 // 1 service name
 #define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 )          \
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString >                              \
+com::sun::star::uno::Sequence< OUString >                              \
 Class::getSupportedServiceNames_Static()                                    \
 {                                                                           \
-    com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 );               \
+    com::sun::star::uno::Sequence< OUString > aSNS( 1 );               \
     aSNS.getArray()[ 0 ] = Service1;                                        \
     return aSNS;                                                            \
 }
@@ -719,7 +719,7 @@ Class::getSupportedServiceNames_Static()                                    \
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
 XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString >                              \
+com::sun::star::uno::Sequence< OUString >                              \
 Class::getSupportedServiceNames_Static()
 
 // Own implementation of getSupportedServiceNames_Static().
@@ -727,7 +727,7 @@ Class::getSupportedServiceNames_Static()
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
 XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class )                                  \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString >                              \
+com::sun::star::uno::Sequence< OUString >                              \
 Class::getSupportedServiceNames_Static()
 
 // 1 service name
@@ -735,10 +735,10 @@ Class::getSupportedServiceNames_Static()
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
 XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString >                              \
+com::sun::star::uno::Sequence< OUString >                              \
 Class::getSupportedServiceNames_Static()                                    \
 {                                                                           \
-    com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 );               \
+    com::sun::star::uno::Sequence< OUString > aSNS( 1 );               \
     aSNS.getArray()[ 0 ] = Service1;                                        \
     return aSNS;                                                            \
 }
@@ -748,10 +748,10 @@ Class::getSupportedServiceNames_Static()                                    \
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
 XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class )                                  \
                                                                             \
-com::sun::star::uno::Sequence< rtl::OUString >                              \
+com::sun::star::uno::Sequence< OUString >                              \
 Class::getSupportedServiceNames_Static()                                    \
 {                                                                           \
-    com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 );               \
+    com::sun::star::uno::Sequence< OUString > aSNS( 1 );               \
     aSNS.getArray()[ 0 ] = Service1;                                        \
     return aSNS;                                                            \
 }
diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
index 7f44794e8428..91459e828ef3 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
@@ -89,7 +89,7 @@ public:
     wasNull()
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getString( sal_Int32 columnIndex )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
@@ -176,7 +176,7 @@ public:
 
     // XColumnLocate
     virtual sal_Int32 SAL_CALL
-    findColumn( const ::rtl::OUString& columnName )
+    findColumn( const OUString& columnName )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
 
@@ -184,60 +184,60 @@ public:
     // Non-interface methods
     //////////////////////////////////////////////////////////////////////
 
-    void appendString( const ::rtl::OUString& rPropName, const ::rtl::OUString& rValue );
-    void appendString( const sal_Char* pAsciiPropName, const ::rtl::OUString& rValue )
+    void appendString( const OUString& rPropName, const OUString& rValue );
+    void appendString( const sal_Char* pAsciiPropName, const OUString& rValue )
     {
-        appendString( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+        appendString( OUString::createFromAscii( pAsciiPropName ), rValue );
     }
-    void appendString( const ::com::sun::star::beans::Property& rProp, const ::rtl::OUString& rValue )
+    void appendString( const ::com::sun::star::beans::Property& rProp, const OUString& rValue )
     {
         appendString( rProp.Name, rValue );
     }
 
-    void appendBoolean( const ::rtl::OUString& rPropName, sal_Bool bValue );
+    void appendBoolean( const OUString& rPropName, sal_Bool bValue );
     void appendBoolean( const sal_Char* pAsciiPropName, sal_Bool bValue )
     {
-        appendBoolean( ::rtl::OUString::createFromAscii( pAsciiPropName ), bValue );
+        appendBoolean( OUString::createFromAscii( pAsciiPropName ), bValue );
     }
     void appendBoolean( const ::com::sun::star::beans::Property& rProp, sal_Bool bValue )
     {
         appendBoolean( rProp.Name, bValue );
     }
 
-    void appendLong( const ::rtl::OUString& rPropName, sal_Int64 nValue );
+    void appendLong( const OUString& rPropName, sal_Int64 nValue );
     void appendLong( const sal_Char* pAsciiPropName, sal_Int64 nValue )
     {
-        appendLong( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue );
+        appendLong( OUString::createFromAscii( pAsciiPropName ), nValue );
     }
     void appendLong( const ::com::sun::star::beans::Property& rProp, sal_Int64 nValue )
     {
         appendLong( rProp.Name, nValue );
     }
 
-    void appendTimestamp( const ::rtl::OUString& rPropName, const ::com::sun::star::util::DateTime& rValue );
+    void appendTimestamp( const OUString& rPropName, const ::com::sun::star::util::DateTime& rValue );
     void appendTimestamp( const sal_Char* pAsciiPropName, const ::com::sun::star::util::DateTime& rValue )
     {
-        appendTimestamp( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+        appendTimestamp( OUString::createFromAscii( pAsciiPropName ), rValue );
     }
     void appendTimestamp( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::DateTime& rValue )
     {
         appendTimestamp( rProp.Name, rValue );
     }
 
-    void appendObject( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
+    void appendObject( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
     void appendObject( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Any& rValue )
     {
-        appendObject( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue );
+        appendObject( OUString::createFromAscii( pAsciiPropName ), rValue );
     }
     void appendObject( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Any& rValue )
     {
         appendObject( rProp.Name, rValue );
     }
 
-    void appendVoid( const ::rtl::OUString& rPropName );
+    void appendVoid( const OUString& rPropName );
     void appendVoid( const sal_Char* pAsciiPropName)
     {
-        appendVoid( ::rtl::OUString::createFromAscii( pAsciiPropName ) );
+        appendVoid( OUString::createFromAscii( pAsciiPropName ) );
     }
     void appendVoid( const ::com::sun::star::beans::Property& rProp )
     {
diff --git a/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx
index 24f63ebeef7e..827d5c8379b2 100644
--- a/ucbhelper/inc/ucbhelper/providerhelper.hxx
+++ b/ucbhelper/inc/ucbhelper/providerhelper.hxx
@@ -111,7 +111,7 @@ protected:
       *         does not exist.
       */
     rtl::Reference< ContentImplHelper >
-    queryExistingContent( const ::rtl::OUString& rURL );
+    queryExistingContent( const OUString& rURL );
 
     /**
       * This method registers a newly created content instance with the
@@ -158,13 +158,13 @@ public:
     // XServiceInfo
     //////////////////////////////////////////////////////////////////////
 
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getImplementationName()
         throw( ::com::sun::star::uno::RuntimeException ) = 0;
     virtual sal_Bool SAL_CALL
-    supportsService( const ::rtl::OUString& ServiceName )
+    supportsService( const OUString& ServiceName )
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
         throw( ::com::sun::star::uno::RuntimeException ) = 0;
 
@@ -228,7 +228,7 @@ public:
       */
     ::com::sun::star::uno::Reference<
         com::sun::star::ucb::XPersistentPropertySet >
-    getAdditionalPropertySet( const ::rtl::OUString& rKey, sal_Bool bCreate );
+    getAdditionalPropertySet( const OUString& rKey, sal_Bool bCreate );
 
     /**
       * This method renames the propertyset containing the Additional Core
@@ -240,8 +240,8 @@ public:
       *         children described by rOldKey shall be renamed, too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool renameAdditionalPropertySet( const ::rtl::OUString& rOldKey,
-                                          const ::rtl::OUString& rNewKey,
+    sal_Bool renameAdditionalPropertySet( const OUString& rOldKey,
+                                          const OUString& rNewKey,
                                           sal_Bool bRecursive );
 
     /**
@@ -254,8 +254,8 @@ public:
       *         children described by rSourceKey shall be copied, too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool copyAdditionalPropertySet( const ::rtl::OUString& rSourceKey,
-                                        const ::rtl::OUString& rTargetKey,
+    sal_Bool copyAdditionalPropertySet( const OUString& rSourceKey,
+                                        const OUString& rTargetKey,
                                         sal_Bool bRecursive );
 
     /**
@@ -267,7 +267,7 @@ public:
       *         children described by rOldKey shall be removed, too.
       * @return True, if the operation succeeded - False, otherwise.
       */
-    sal_Bool removeAdditionalPropertySet( const ::rtl::OUString& rKey,
+    sal_Bool removeAdditionalPropertySet( const OUString& rKey,
                                           sal_Bool bRecursive );
 };
 
diff --git a/ucbhelper/inc/ucbhelper/proxydecider.hxx b/ucbhelper/inc/ucbhelper/proxydecider.hxx
index fd59eae29b89..e3ec58180a00 100644
--- a/ucbhelper/inc/ucbhelper/proxydecider.hxx
+++ b/ucbhelper/inc/ucbhelper/proxydecider.hxx
@@ -40,7 +40,7 @@ struct InternetProxyServer
     /**
       * The name of the proxy server.
       */
-    ::rtl::OUString aName;
+    OUString aName;
 
     /**
       * The port of the proxy server.
@@ -101,8 +101,8 @@ public:
       * @return true if a proxy server should be used, false otherwise.
       */
     bool
-    shouldUseProxy( const rtl::OUString & rProtocol,
-                    const rtl::OUString & rHost,
+    shouldUseProxy( const OUString & rProtocol,
+                    const OUString & rHost,
                     sal_Int32 nPort ) const;
 
     /**
@@ -123,8 +123,8 @@ public:
       *         InternetProxyServer is empty no proxy server is to be used.
       */
     const InternetProxyServer &
-    getProxy( const rtl::OUString & rProtocol,
-              const rtl::OUString & rHost,
+    getProxy( const OUString & rProtocol,
+              const OUString & rHost,
               sal_Int32 nPort ) const;
 
 private:
diff --git a/ucbhelper/inc/ucbhelper/registerucb.hxx b/ucbhelper/inc/ucbhelper/registerucb.hxx
index f89873193bb2..c86bf45cfef9 100644
--- a/ucbhelper/inc/ucbhelper/registerucb.hxx
+++ b/ucbhelper/inc/ucbhelper/registerucb.hxx
@@ -48,11 +48,11 @@ struct ContentProviderRegistrationInfo
 
     /** The arguments the content provider was instantiated with.
      */
-    rtl::OUString m_aArguments;
+    OUString m_aArguments;
 
     /** The URL template the content provider is registered on.
      */
-    rtl::OUString m_aTemplate;
+    OUString m_aTemplate;
 };
 
 typedef std::vector< ContentProviderRegistrationInfo >
@@ -66,20 +66,20 @@ struct ContentProviderData
 {
     /** The UNO service name to use to instanciate the content provider.
      */
-    rtl::OUString ServiceName;
+    OUString ServiceName;
 
     /** The URL template to use to instanciate the content provider.
      */
-    rtl::OUString URLTemplate;
+    OUString URLTemplate;
 
     /** The arguments to use to instanciate the content provider.
      */
-    rtl::OUString Arguments;
+    OUString Arguments;
 
     ContentProviderData() {};
-    ContentProviderData( const rtl::OUString & rService,
-                         const rtl::OUString & rTemplate,
-                         const rtl::OUString & rArgs )
+    ContentProviderData( const OUString & rService,
+                         const OUString & rTemplate,
+                         const OUString & rArgs )
     : ServiceName( rService ), URLTemplate( rTemplate ), Arguments( rArgs ) {}
 };
 
@@ -111,9 +111,9 @@ UCBHELPER_DLLPUBLIC bool registerAtUcb(
     com::sun::star::uno::Reference<
             com::sun::star::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 (com::sun::star::uno::RuntimeException);
 
diff --git a/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx
index 68ec9bcbb082..531955124f2b 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/ucbhelper/inc/ucbhelper/resultset.hxx
@@ -130,7 +130,7 @@ public:
         throw( com::sun::star::uno::RuntimeException );
 
     // XContentAccess
-    virtual rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     queryContentIdentifierString()
         throw( com::sun::star::uno::RuntimeException );
     virtual com::sun::star::uno::Reference<
@@ -229,7 +229,7 @@ public:
     wasNull()
         throw( com::sun::star::sdbc::SQLException,
                com::sun::star::uno::RuntimeException );
-    virtual rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getString( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
                com::sun::star::uno::RuntimeException );
@@ -326,7 +326,7 @@ public:
     getPropertySetInfo()
         throw( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    setPropertyValue( const rtl::OUString& aPropertyName,
+    setPropertyValue( const OUString& aPropertyName,
                       const com::sun::star::uno::Any& aValue )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::beans::PropertyVetoException,
@@ -334,33 +334,33 @@ public:
                com::sun::star::lang::WrappedTargetException,
                com::sun::star::uno::RuntimeException );
     virtual com::sun::star::uno::Any SAL_CALL
-    getPropertyValue( const rtl::OUString& PropertyName )
+    getPropertyValue( const OUString& PropertyName )
         throw( com::sun::star::beans::UnknownPropertyException,
         com::sun::star::lang::WrappedTargetException,
         com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    addPropertyChangeListener( const rtl::OUString& aPropertyName,
+    addPropertyChangeListener( const OUString& aPropertyName,
                                const com::sun::star::uno::Reference<
                                        com::sun::star::beans::XPropertyChangeListener >& xListener )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::lang::WrappedTargetException,
                com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    removePropertyChangeListener( const rtl::OUString& aPropertyName,
+    removePropertyChangeListener( const OUString& aPropertyName,
                                   const com::sun::star::uno::Reference<
                                       com::sun::star::beans::XPropertyChangeListener >& aListener )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::lang::WrappedTargetException,
                com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    addVetoableChangeListener( const rtl::OUString& PropertyName,
+    addVetoableChangeListener( const OUString& PropertyName,
                                const com::sun::star::uno::Reference<
                                        com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::lang::WrappedTargetException,
                com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL
-    removeVetoableChangeListener( const rtl::OUString& PropertyName,
+    removeVetoableChangeListener( const OUString& PropertyName,
                                   const com::sun::star::uno::Reference<
                                       com::sun::star::beans::XVetoableChangeListener >& aListener )
         throw( com::sun::star::beans::UnknownPropertyException,
@@ -448,7 +448,7 @@ public:
      *               of the supplier; must be non-negative.
      * @return the content's identifier string.
      */
-    virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ) = 0;
+    virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) = 0;
 
     /**
      * This method returns the identifier of the content at the specified index.
diff --git a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
index 129f1f8b90bf..35996657553a 100644
--- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
@@ -73,10 +73,10 @@ struct ResultSetColumnData
     sal_Int32       columnDisplaySize;
 
     /** @see ResultSetMetaData::getColumnLabel */
-    ::rtl::OUString columnLabel;
+    OUString columnLabel;
 
     /** @see ResultSetMetaData::getSchemaName */
-    ::rtl::OUString schemaName;
+    OUString schemaName;
 
     /** @see ResultSetMetaData::getPrecision */
     sal_Int32       precision;
@@ -85,13 +85,13 @@ struct ResultSetColumnData
     sal_Int32       scale;
 
     /** @see ResultSetMetaData::getTableName */
-    ::rtl::OUString tableName;
+    OUString tableName;
 
     /** @see ResultSetMetaData::getCatalogName */
-    ::rtl::OUString catalogName;
+    OUString catalogName;
 
     /** @see ResultSetMetaData::getColumnTypeName */
-    ::rtl::OUString columnTypeName;
+    OUString columnTypeName;
 
     /** @see ResultSetMetaData::isReadOnly */
     sal_Bool        isReadOnly;
@@ -103,7 +103,7 @@ struct ResultSetColumnData
     sal_Bool        isDefinitelyWritable;
 
     /** @see ResultSetMetaData::getColumnServiceName */
-    ::rtl::OUString columnServiceName;
+    OUString columnServiceName;
 
     inline ResultSetColumnData();
 };
@@ -300,7 +300,7 @@ public:
       *         be returned. The first column is 1, the second is 2, ...
       * @return the column label.
       */
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getColumnLabel( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
@@ -311,7 +311,7 @@ public:
       *         be returned. The first column is 1, the second is 2, ...
       * @return the name of the property that corresponds to column.
       */
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getColumnName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
@@ -325,7 +325,7 @@ public:
       *         be returned. The first column is 1, the second is 2, ...
       * @return the schema name of column or an empty string.
       */
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getSchemaName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
@@ -366,11 +366,11 @@ public:
       *         be returned. The first column is 1, the second is 2, ...
       * @return the table name for column or an empty string.
       */
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getTableName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     /**
       * Gets the catalog name for the table from which column of this
       * result set was derived.
@@ -409,7 +409,7 @@ public:
       *         be returned. The first column is 1, the second is 2, ...
       * @return the column type name.
       */
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getColumnTypeName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
@@ -457,7 +457,7 @@ public:
       * @return the service name for column or an empty string, if no service
       *         is applicable.
       */
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getColumnServiceName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
                ::com::sun::star::uno::RuntimeException );
diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
index c6ab78954e4d..7a084265003c 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
@@ -90,12 +90,12 @@ public:
       * @param bAllowUseSystemCredntials specifies if requesting client is
       *        able to obtain and use system credentials for authentication
       */
-    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,
+    SimpleAuthenticationRequest( const OUString & rURL,
+                                 const OUString & rServerName,
+                                 const OUString & rRealm,
+                                 const OUString & rUserName,
+                                 const OUString & rPassword,
+                                 const OUString & rAccount,
                                  sal_Bool bAllowPersistentStoring,
                                  sal_Bool bAllowUseSystemCredentials );
 
@@ -119,17 +119,17 @@ public:
                modifiable.
       * @param rAccount contains an account, if applicable.
       */
-    SimpleAuthenticationRequest( const rtl::OUString & rURL,
-                                 const rtl::OUString & rServerName,
+    SimpleAuthenticationRequest( 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 = ENTITY_NA,
-                                 const rtl::OUString & rAccount
-                                    = rtl::OUString() );
+                                 const OUString & rAccount
+                                    = OUString() );
 
     /**
       * This method returns the supplier for the missing authentication data,
diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
index 6d8dcced064c..3f761153582b 100644
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
@@ -53,7 +53,7 @@ public:
       */
     SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity,
         const com::sun::star::uno::Reference<com::sun::star::security::XCertificate> pCertificate,
-        const rtl::OUString & hostname );
+        const OUString & hostname );
 };
 
 } // namespace ucbhelper
diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
index 5def64c8af4d..d4c9c5277316 100644
--- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
@@ -56,7 +56,7 @@ public:
     SimpleIOErrorRequest( const com::sun::star::ucb::IOErrorCode eError,
                           const com::sun::star::uno::Sequence<
                             com::sun::star::uno::Any > & rArgs,
-                          const rtl::OUString & rMessage,
+                          const OUString & rMessage,
                           const com::sun::star::uno::Reference<
                             com::sun::star::ucb::XCommandProcessor > & xContext
                          );
diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
index d9084d034903..be789fd6a148 100644
--- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
@@ -55,9 +55,9 @@ public:
       *        InteractionReplaceExistingData continuation shall be supplied
       *        with the interaction request.
       */
-    SimpleNameClashResolveRequest( const rtl::OUString & rTargetFolderURL,
-                                   const rtl::OUString & rClashingName,
-                                   const rtl::OUString & rProposedNewName,
+    SimpleNameClashResolveRequest( const OUString & rTargetFolderURL,
+                                   const OUString & rClashingName,
+                                   const OUString & rProposedNewName,
                                    sal_Bool bSupportsOverwriteData = sal_True );
     /**
       * This method returns the new name that was supplied by the interaction
@@ -65,7 +65,7 @@ public:
       *
       * @return the new name, if supplied.
       */
-    const rtl::OUString getNewName() const
+    const OUString getNewName() const
     { return m_xNameSupplier->getName(); }
 
 };
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 62a384485ffc..b5f710e0cc14 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -166,7 +166,7 @@ class Content_Impl : public salhelper::SimpleReferenceObject
 {
 friend class ContentEventListener_Impl;
 
-    mutable rtl::OUString               m_aURL;
+    mutable OUString               m_aURL;
     Reference< XComponentContext >      m_xCtx;
     Reference< XContent >               m_xContent;
     Reference< XCommandProcessor >          m_xCommandProcessor;
@@ -186,7 +186,7 @@ public:
 
     virtual ~Content_Impl();
 
-    const rtl::OUString&           getURL() const;
+    const OUString&           getURL() const;
     Reference< XContent >          getContent();
     Reference< XCommandProcessor > getCommandProcessor();
     Reference< XComponentContext > getComponentContext()
@@ -206,7 +206,7 @@ public:
 //=========================================================================
 
 static void ensureContentProviderForURL( const Reference< XUniversalContentBroker >& rBroker,
-                                         const rtl::OUString & rURL )
+                                         const OUString & rURL )
     throw ( ContentCreationException, RuntimeException )
 {
     Reference< XContentProvider > xProv
@@ -223,7 +223,7 @@ static void ensureContentProviderForURL( const Reference< XUniversalContentBroke
 //=========================================================================
 static Reference< XContentIdentifier > getContentIdentifier(
                                     const Reference< XUniversalContentBroker > & rBroker,
-                                    const rtl::OUString & rURL,
+                                    const OUString & rURL,
                                     bool bThrow )
     throw ( ContentCreationException, RuntimeException )
 {
@@ -254,7 +254,7 @@ static Reference< XContent > getContent(
     throw ( ContentCreationException, RuntimeException )
 {
     Reference< XContent > xContent;
-    rtl::OUString msg;
+    OUString msg;
     try
     {
         xContent = rBroker->queryContent( xId );
@@ -295,7 +295,7 @@ Content::Content()
 }
 
 //=========================================================================
-Content::Content( const rtl::OUString& rURL,
+Content::Content( const OUString& rURL,
                   const Reference< XCommandEnvironment >& rEnv,
                   const Reference< XComponentContext >& rCtx )
     throw ( ContentCreationException, RuntimeException )
@@ -328,7 +328,7 @@ Content::Content( const Content& rOther )
 
 //=========================================================================
 // static
-sal_Bool Content::create( const rtl::OUString& rURL,
+sal_Bool Content::create( const OUString& rURL,
                           const Reference< XCommandEnvironment >& rEnv,
                           const Reference< XComponentContext >& rCtx,
                           Content& rContent )
@@ -370,7 +370,7 @@ Reference< XContent > Content::get() const
 }
 
 //=========================================================================
-const rtl::OUString& Content::getURL() const
+const OUString& Content::getURL() const
 {
     return m_xImpl->getURL();
 }
@@ -393,7 +393,7 @@ Reference< XCommandInfo > Content::getCommands()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
-    aCommand.Name     = rtl::OUString("getCommandInfo");
+    aCommand.Name     = OUString("getCommandInfo");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument = Any();
 
@@ -409,7 +409,7 @@ Reference< XPropertySetInfo > Content::getProperties()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Command aCommand;
-    aCommand.Name     = rtl::OUString("getPropertySetInfo");
+    aCommand.Name     = OUString("getPropertySetInfo");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument = Any();
 
@@ -421,10 +421,10 @@ Reference< XPropertySetInfo > Content::getProperties()
 }
 
 //=========================================================================
-Any Content::getPropertyValue( const rtl::OUString& rPropertyName )
+Any Content::getPropertyValue( const OUString& rPropertyName )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
-    Sequence< rtl::OUString > aNames( 1 );
+    Sequence< OUString > aNames( 1 );
     aNames.getArray()[ 0 ] = rPropertyName;
 
     Sequence< Any > aRet = getPropertyValues( aNames );
@@ -432,11 +432,11 @@ Any Content::getPropertyValue( const rtl::OUString& rPropertyName )
 }
 
 //=========================================================================
-Any Content::setPropertyValue( const rtl::OUString& rName,
+Any Content::setPropertyValue( const OUString& rName,
                                 const Any& rValue )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
-    Sequence< rtl::OUString > aNames( 1 );
+    Sequence< OUString > aNames( 1 );
     aNames.getArray()[ 0 ] = rName;
 
     Sequence< Any > aValues( 1 );
@@ -448,7 +448,7 @@ Any Content::setPropertyValue( const rtl::OUString& rName,
 
 //=========================================================================
 Sequence< Any > Content::getPropertyValues(
-                            const Sequence< rtl::OUString >& rPropertyNames )
+                            const Sequence< OUString >& rPropertyNames )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Reference< XRow > xRow = getPropertyValuesInterface( rPropertyNames );
@@ -469,14 +469,14 @@ Sequence< Any > Content::getPropertyValues(
 
 //=========================================================================
 Reference< XRow > Content::getPropertyValuesInterface(
-                            const Sequence< rtl::OUString >& rPropertyNames )
+                            const Sequence< OUString >& rPropertyNames )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Int32 nCount = rPropertyNames.getLength();
     Sequence< Property > aProps( nCount );
     Property* pProps = aProps.getArray();
 
-    const rtl::OUString* pNames  = rPropertyNames.getConstArray();
+    const OUString* pNames  = rPropertyNames.getConstArray();
 
     for ( sal_Int32 n = 0; n< nCount; ++n )
     {
@@ -489,7 +489,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
     }
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("getPropertyValues");
+    aCommand.Name     = OUString("getPropertyValues");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aProps;
 
@@ -502,7 +502,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
 
 //=========================================================================
 Sequence< Any > Content::setPropertyValues(
-                            const Sequence< rtl::OUString >& rPropertyNames,
+                            const Sequence< OUString >& rPropertyNames,
                                 const Sequence< Any >& rValues )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
@@ -510,7 +510,7 @@ Sequence< Any > Content::setPropertyValues(
     {
         ucbhelper::cancelCommandExecution(
             makeAny( IllegalArgumentException(
-                        rtl::OUString(
+                        OUString(
                             "Length of property names sequence and value "
                             "sequence are unequal!" ),
                         get(),
@@ -523,7 +523,7 @@ Sequence< Any > Content::setPropertyValues(
     Sequence< PropertyValue > aProps( nCount );
     PropertyValue* pProps = aProps.getArray();
 
-    const rtl::OUString* pNames  = rPropertyNames.getConstArray();
+    const OUString* pNames  = rPropertyNames.getConstArray();
     const Any* pValues = rValues.getConstArray();
 
     for ( sal_Int32 n = 0; n< nCount; ++n )
@@ -537,7 +537,7 @@ Sequence< Any > Content::setPropertyValues(
     }
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("setPropertyValues");
+    aCommand.Name     = OUString("setPropertyValues");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aProps;
 
@@ -549,7 +549,7 @@ Sequence< Any > Content::setPropertyValues(
 }
 
 //=========================================================================
-Any Content::executeCommand( const rtl::OUString& rCommandName,
+Any Content::executeCommand( const OUString& rCommandName,
                              const Any& rCommandArgument )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
@@ -562,14 +562,14 @@ Any Content::executeCommand( const rtl::OUString& rCommandName,
 }
 
 //=========================================================================
-Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
+Any Content::createCursorAny( const Sequence< OUString >& rPropertyNames,
                               ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Int32 nCount = rPropertyNames.getLength();
     Sequence< Property > aProps( nCount );
     Property* pProps = aProps.getArray();
-    const rtl::OUString* pNames = rPropertyNames.getConstArray();
+    const OUString* pNames = rPropertyNames.getConstArray();
     for ( sal_Int32 n = 0; n < nCount; ++n )
     {
         Property& rProp = pProps[ n ];
@@ -587,7 +587,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
     aArg.Properties = aProps;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -596,7 +596,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
 
 //=========================================================================
 Reference< XResultSet > Content::createCursor(
-                            const Sequence< rtl::OUString >& rPropertyNames,
+                            const Sequence< OUString >& rPropertyNames,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
@@ -626,7 +626,7 @@ Reference< XResultSet > Content::createCursor(
 
 //=========================================================================
 Reference< XDynamicResultSet > Content::createDynamicCursor(
-                            const Sequence< rtl::OUString >& rPropertyNames,
+                            const Sequence< OUString >& rPropertyNames,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
@@ -640,7 +640,7 @@ Reference< XDynamicResultSet > Content::createDynamicCursor(
 
 //=========================================================================
 Reference< XResultSet > Content::createSortedCursor(
-                            const Sequence< rtl::OUString >& rPropertyNames,
+                            const Sequence< OUString >& rPropertyNames,
                             const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
@@ -706,7 +706,7 @@ Reference< XInputStream > Content::openStream()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -731,7 +731,7 @@ Reference< XInputStream > Content::openStreamNoLock()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -756,7 +756,7 @@ Reference< XStream > Content::openWriteableStream()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -781,7 +781,7 @@ Reference< XStream > Content::openWriteableStreamNoLock()
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -804,7 +804,7 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -827,7 +827,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
     aArg.Properties = Sequence< Property >( 0 ); // unused
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("open");
+    aCommand.Name     = OUString("open");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -846,7 +846,7 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
     aArg.ReplaceExisting = bReplaceExisting;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("insert");
+    aCommand.Name     = OUString("insert");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aArg;
 
@@ -862,7 +862,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo()
     // First, try it using "CreatableContentsInfo" property -> the "new" way.
     Sequence< ContentInfo > aInfo;
     if ( getPropertyValue(
-             rtl::OUString("CreatableContentsInfo") )
+             OUString("CreatableContentsInfo") )
          >>= aInfo )
         return aInfo;
 
@@ -876,8 +876,8 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo()
 }
 
 //=========================================================================
-sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
-                                    const Sequence< rtl::OUString >&
+sal_Bool Content::insertNewContent( const OUString& rContentType,
+                                    const Sequence< OUString >&
                                         rPropertyNames,
                                     const Sequence< Any >& rPropertyValues,
                                     Content& rNewContent )
@@ -891,8 +891,8 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 }
 
 //=========================================================================
-sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
-                                    const Sequence< rtl::OUString >&
+sal_Bool Content::insertNewContent( const OUString& rContentType,
+                                    const Sequence< OUString >&
                                         rPropertyNames,
                                     const Sequence< Any >& rPropertyValues,
                                     const Reference< XInputStream >& rData,
@@ -908,7 +908,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
     aInfo.Attributes = 0;
 
     Command aCommand;
-    aCommand.Name     = rtl::OUString("createNewContent");
+    aCommand.Name     = OUString("createNewContent");
     aCommand.Handle   = -1; // n/a
     aCommand.Argument <<= aInfo;
 
@@ -943,7 +943,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
     Content aNewContent(
         xNew, m_xImpl->getEnvironment(), m_xImpl->getComponentContext() );
     aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
-    aNewContent.executeCommand( rtl::OUString("insert"),
+    aNewContent.executeCommand( OUString("insert"),
                                 makeAny(
                                     InsertCommandArgument(
                                         rData.is() ? rData : new EmptyInputStream,
@@ -957,12 +957,12 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 //=========================================================================
 sal_Bool Content::transferContent( const Content& rSourceContent,
                                    InsertOperation eOperation,
-                                   const rtl::OUString & rTitle,
+                                   const OUString & rTitle,
                                    const sal_Int32 nNameClashAction,
-                                   const rtl::OUString & rMimeType,
+                                   const OUString & rMimeType,
                                    bool bMajorVersion,
-                                   const rtl::OUString & rVersionComment,
-                                   rtl::OUString* pResultURL )
+                                   const OUString & rVersionComment,
+                                   OUString* pResultURL )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Reference< XUniversalContentBroker > pBroker(
@@ -971,7 +971,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
     // Execute command "globalTransfer" at UCB.
 
     TransferCommandOperation eTransOp = TransferCommandOperation();
-    rtl::OUString sCommand( "globalTransfer" );
+    OUString sCommand( "globalTransfer" );
     bool bCheckIn = false;
     switch ( eOperation )
     {
@@ -989,14 +989,14 @@ sal_Bool Content::transferContent( const Content& rSourceContent,
 
         case InsertOperation_CHECKIN:
             eTransOp = TransferCommandOperation_COPY;
-            sCommand = rtl::OUString( "checkin" );
+            sCommand = OUString( "checkin" );
             bCheckIn = true;
             break;
 
         default:
             ucbhelper::cancelCommandExecution(
                 makeAny( IllegalArgumentException(
-                            rtl::OUString(
+                            OUString(
                                 "Unknown transfer operation!" ),
                             get(),
                             -1 ) ),
@@ -1036,13 +1036,13 @@ sal_Bool Content::isFolder()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Bool bFolder = sal_False;
-    if ( getPropertyValue( rtl::OUString("IsFolder") )
+    if ( getPropertyValue( OUString("IsFolder") )
         >>= bFolder )
         return bFolder;
 
      ucbhelper::cancelCommandExecution(
          makeAny( UnknownPropertyException(
-                    rtl::OUString(
+                    OUString(
                         "Unable to retrieve value of property 'IsFolder'!" ),
                     get() ) ),
          m_xImpl->getEnvironment() );
@@ -1057,13 +1057,13 @@ sal_Bool Content::isDocument()
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     sal_Bool bDoc = sal_False;
-    if ( getPropertyValue( rtl::OUString("IsDocument") )
+    if ( getPropertyValue( OUString("IsDocument") )
         >>= bDoc )
         return bDoc;
 
      ucbhelper::cancelCommandExecution(
          makeAny( UnknownPropertyException(
-                    rtl::OUString(
+                    OUString(
                         "Unable to retrieve value of property 'IsDocument'!" ),
                     get() ) ),
          m_xImpl->getEnvironment() );
@@ -1171,7 +1171,7 @@ void Content_Impl::disposing( const EventObject& Source )
 
         xContent = m_xContent;
 
-        m_aURL = rtl::OUString();
+        m_aURL = OUString();
         m_xCommandProcessor = 0;
         m_xContent = 0;
     }
@@ -1189,7 +1189,7 @@ void Content_Impl::disposing( const EventObject& Source )
 }
 
 //=========================================================================
-const rtl::OUString& Content_Impl::getURL() const
+const OUString& Content_Impl::getURL() const
 {
     if ( m_aURL.isEmpty() && m_xContent.is() )
     {
@@ -1292,7 +1292,7 @@ void Content_Impl::inserted()
 {
     // URL might have changed during 'insert' => recalculate in next getURL()
     osl::MutexGuard aGuard( m_aMutex );
-    m_aURL = ::rtl::OUString();
+    m_aURL = OUString();
 }
 
 //=========================================================================
diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx
index 1f53b4a1035c..c1498cc21680 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.cxx
@@ -37,14 +37,14 @@ namespace ucbhelper {
 //
 //============================================================================
 
-rtl::OUString
+OUString
 getLocalFileURL() SAL_THROW((uno::RuntimeException))
 {
     // If there were more file systems than just "file:///" (e.g., the obsolete
     // "vnd.sun.star.wfs:///"), this code should query all relevant UCPs for
     // their com.sun.star.ucb.XFileIdentifierConverter.getFileProviderLocality
     // and return the most local one:
-    return rtl::OUString("file:///");
+    return OUString("file:///");
 }
 
 //============================================================================
@@ -53,11 +53,11 @@ getLocalFileURL() SAL_THROW((uno::RuntimeException))
 //
 //============================================================================
 
-rtl::OUString
+OUString
 getFileURLFromSystemPath(
     uno::Reference< ucb::XUniversalContentBroker > const & rUcb,
-    rtl::OUString const & rBaseURL,
-    rtl::OUString const & rSystemPath)
+    OUString const & rBaseURL,
+    OUString const & rSystemPath)
     SAL_THROW((uno::RuntimeException))
 {
     OSL_ASSERT(rUcb.is());
@@ -67,7 +67,7 @@ getFileURLFromSystemPath(
     if (xConverter.is())
         return xConverter->getFileURLFromSystemPath(rBaseURL, rSystemPath);
     else
-        return rtl::OUString();
+        return OUString();
 }
 
 //============================================================================
@@ -76,10 +76,10 @@ getFileURLFromSystemPath(
 //
 //============================================================================
 
-rtl::OUString
+OUString
 getSystemPathFromFileURL(
     uno::Reference< ucb::XUniversalContentBroker > const & rUcb,
-    rtl::OUString const & rURL)
+    OUString const & rURL)
     SAL_THROW((uno::RuntimeException))
 {
     OSL_ASSERT(rUcb.is());
@@ -89,7 +89,7 @@ getSystemPathFromFileURL(
     if (xConverter.is())
         return xConverter->getSystemPathFromFileURL(rURL);
     else
-        return rtl::OUString();
+        return OUString();
 }
 
 }
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 4230eac91108..f449ff9b4f92 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -64,15 +64,15 @@ namespace proxydecider_impl
 class WildCard
 {
 private:
-    rtl::OString m_aWildString;
+    OString m_aWildString;
 
 public:
-    WildCard( const rtl::OUString& rWildCard )
+    WildCard( const OUString& rWildCard )
     : m_aWildString(
-        rtl::OUStringToOString(
+        OUStringToOString(
             rWildCard, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() ) {}
 
-    bool Matches( const rtl::OUString & rStr ) const;
+    bool Matches( const OUString & rStr ) const;
 };
 
 //=========================================================================
@@ -82,7 +82,7 @@ typedef std::pair< WildCard, WildCard > NoProxyListEntry;
 
 class HostnameCache
 {
-    typedef std::pair< rtl::OUString, rtl::OUString > HostListEntry;
+    typedef std::pair< OUString, OUString > HostListEntry;
 
     std::list< HostListEntry >     m_aHostList;
     sal_uInt32                     m_nCapacity;
@@ -91,7 +91,7 @@ public:
     explicit HostnameCache( sal_uInt32 nCapacity )
         : m_nCapacity( nCapacity ) {}
 
-    bool get( const rtl::OUString & rKey, rtl::OUString & rValue ) const
+    bool get( const OUString & rKey, OUString & rValue ) const
     {
         std::list< HostListEntry >::const_iterator it
             = m_aHostList.begin();
@@ -110,7 +110,7 @@ public:
         return false;
     }
 
-    void put( const rtl::OUString & rKey, const rtl::OUString & rValue )
+    void put( const OUString & rKey, const OUString & rValue )
     {
         if ( m_aHostList.size() == m_nCapacity )
             m_aHostList.resize( m_nCapacity / 2 );
@@ -134,7 +134,7 @@ class InternetProxyDecider_Impl :
     mutable HostnameCache                    m_aHostnames;
 
 private:
-    bool shouldUseProxy( const rtl::OUString & rHost,
+    bool shouldUseProxy( const OUString & rHost,
                          sal_Int32 nPort,
                          bool bUseFullyQualified ) const;
 public:
@@ -144,8 +144,8 @@ public:
 
     void dispose();
 
-    const InternetProxyServer & getProxy( const rtl::OUString & rProtocol,
-                                          const rtl::OUString & rHost,
+    const InternetProxyServer & getProxy( const OUString & rProtocol,
+                                          const OUString & rHost,
                                           sal_Int32 nPort ) const;
 
     // XChangesListener
@@ -157,7 +157,7 @@ public:
         throw( uno::RuntimeException );
 
 private:
-    void setNoProxyList( const rtl::OUString & rNoProxyList );
+    void setNoProxyList( const OUString & rNoProxyList );
 };
 
 //=========================================================================
@@ -168,10 +168,10 @@ private:
 //=========================================================================
 //=========================================================================
 
-bool WildCard::Matches( const rtl::OUString& rString ) const
+bool WildCard::Matches( const OUString& rString ) const
 {
-    rtl::OString aString
-        = rtl::OUStringToOString(
+    OString aString
+        = OUStringToOString(
                     rString, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase();
     const char * pStr  = aString.getStr();
     const char * pWild = m_aWildString.getStr();
@@ -240,11 +240,11 @@ bool WildCard::Matches( const rtl::OUString& rString ) const
 bool getConfigStringValue(
     const uno::Reference< container::XNameAccess > & xNameAccess,
     const char * key,
-    rtl::OUString & value )
+    OUString & value )
 {
     try
     {
-        if ( !( xNameAccess->getByName( rtl::OUString::createFromAscii( key ) )
+        if ( !( xNameAccess->getByName( OUString::createFromAscii( key ) )
                 >>= value ) )
         {
             OSL_FAIL( "InternetProxyDecider - "
@@ -272,7 +272,7 @@ bool getConfigInt32Value(
     try
     {
         uno::Any aValue = xNameAccess->getByName(
-            rtl::OUString::createFromAscii( key ) );
+            OUString::createFromAscii( key ) );
         if ( aValue.hasValue() && !( aValue >>= value ) )
         {
             OSL_FAIL( "InternetProxyDecider - "
@@ -314,11 +314,11 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                 configuration::theDefaultProvider::get( rxContext );
 
         uno::Sequence< uno::Any > aArguments( 1 );
-        aArguments[ 0 ] <<= rtl::OUString( CONFIG_ROOT_KEY );
+        aArguments[ 0 ] <<= OUString( CONFIG_ROOT_KEY );
 
         uno::Reference< uno::XInterface > xInterface(
                     xConfigProv->createInstanceWithArguments(
-                        rtl::OUString(
+                        OUString(
                             "com.sun.star.configuration.ConfigurationAccess" ),
                     aArguments ) );
 
@@ -339,7 +339,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl(
                     xNameAccess, PROXY_TYPE_KEY, m_nProxyType );
 
                 // *** No proxy list ***
-                rtl::OUString aNoProxyList;
+                OUString aNoProxyList;
                 getConfigStringValue(
                     xNameAccess, NO_PROXY_LIST_KEY, aNoProxyList );
                 setNoProxyList( aNoProxyList );
@@ -420,11 +420,11 @@ void InternetProxyDecider_Impl::dispose()
 }
 
 //=========================================================================
-bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost,
+bool InternetProxyDecider_Impl::shouldUseProxy( const OUString & rHost,
                                                 sal_Int32 nPort,
                                                 bool bUseFullyQualified ) const
 {
-    rtl::OUStringBuffer aBuffer;
+    OUStringBuffer aBuffer;
 
     if ( ( rHost.indexOf( ':' ) != -1 ) &&
          ( rHost[ 0 ] != sal_Unicode( '[' ) ) )
@@ -441,8 +441,8 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost,
     }
 
     aBuffer.append( sal_Unicode( ':' ) );
-    aBuffer.append( rtl::OUString::valueOf( nPort ) );
-    const rtl::OUString aHostAndPort( aBuffer.makeStringAndClear() );
+    aBuffer.append( OUString::valueOf( nPort ) );
+    const OUString aHostAndPort( aBuffer.makeStringAndClear() );
 
     std::vector< NoProxyListEntry >::const_iterator it
         = m_aNoProxyList.begin();
@@ -469,8 +469,8 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost,
 
 //=========================================================================
 const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
-                                            const rtl::OUString & rProtocol,
-                                            const rtl::OUString & rHost,
+                                            const OUString & rProtocol,
+                                            const OUString & rHost,
                                             sal_Int32 nPort ) const
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -494,7 +494,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
         // Second, try match against full qualified hostname - #104401#
         //////////////////////////////////////////////////////////////////
 
-        rtl::OUString aHost;
+        OUString aHost;
 
         if ( ( rHost[ 0 ] == sal_Unicode( '[' ) ) &&
              ( rHost.getLength() > 1 ) )
@@ -508,7 +508,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
             aHost = rHost;
         }
 
-        rtl::OUString aFullyQualifiedHost;
+        OUString aFullyQualifiedHost;
         if ( !m_aHostnames.get( aHost, aFullyQualifiedHost ) )
         {
             // This might be quite expensive (DNS lookup).
@@ -575,7 +575,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
             const util::ElementChange& rElem = pElementChanges[ n ];
-            rtl::OUString aKey;
+            OUString aKey;
             if ( ( rElem.Accessor >>= aKey ) && !aKey.isEmpty() )
             {
                 if ( aKey == PROXY_TYPE_KEY )
@@ -588,7 +588,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                 }
                 else if ( aKey == NO_PROXY_LIST_KEY )
                 {
-                    rtl::OUString aNoProxyList;
+                    OUString aNoProxyList;
                     if ( !( rElem.Element >>= aNoProxyList ) )
                     {
                         OSL_FAIL( "InternetProxyDecider - changesOccurred - "
@@ -672,7 +672,7 @@ void SAL_CALL InternetProxyDecider_Impl::disposing(const lang::EventObject&)
 
 //=========================================================================
 void InternetProxyDecider_Impl::setNoProxyList(
-                                        const rtl::OUString & rNoProxyList )
+                                        const OUString & rNoProxyList )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -692,12 +692,12 @@ void InternetProxyDecider_Impl::setNoProxyList(
             if ( nEnd == -1 )
                 nEnd = nLen;
 
-            rtl::OUString aToken = rNoProxyList.copy( nPos, nEnd - nPos );
+            OUString aToken = rNoProxyList.copy( nPos, nEnd - nPos );
 
             if ( !aToken.isEmpty() )
             {
-                rtl::OUString aServer;
-                rtl::OUString aPort;
+                OUString aServer;
+                OUString aPort;
 
                 // numerical IPv6 address?
                 bool bIPv6Address = false;
@@ -711,14 +711,14 @@ void InternetProxyDecider_Impl::setNoProxyList(
                 if ( nColonPos == -1 )
                 {
                     // No port given, server pattern equals current token
-                    aPort = rtl::OUString("*");
+                    aPort = OUString("*");
                     if ( aToken.indexOf( '*' ) == -1 )
                     {
                         // pattern describes exactly one server
                         aServer = aToken;
                     }
 
-                    aToken += rtl::OUString(":*");
+                    aToken += OUString(":*");
                 }
                 else
                 {
@@ -732,7 +732,7 @@ void InternetProxyDecider_Impl::setNoProxyList(
                     }
                 }
 
-                rtl::OUStringBuffer aFullyQualifiedHost;
+                OUStringBuffer aFullyQualifiedHost;
                 if ( !aServer.isEmpty() )
                 {
                     // Remember fully qualified server name if current list
@@ -746,7 +746,7 @@ void InternetProxyDecider_Impl::setNoProxyList(
 
                     // This might be quite expensive (DNS lookup).
                     const osl::SocketAddr aAddr( aServer, 0 );
-                    rtl::OUString aTmp = aAddr.getHostname().toAsciiLowerCase();
+                    OUString aTmp = aAddr.getHostname().toAsciiLowerCase();
                     if ( aTmp != aServer.toAsciiLowerCase() )
                     {
                         if ( bIPv6Address )
@@ -809,8 +809,8 @@ InternetProxyDecider::~InternetProxyDecider()
 }
 
 //=========================================================================
-bool InternetProxyDecider::shouldUseProxy( const rtl::OUString & rProtocol,
-                                           const rtl::OUString & rHost,
+bool InternetProxyDecider::shouldUseProxy( const OUString & rProtocol,
+                                           const OUString & rHost,
                                            sal_Int32 nPort ) const
 {
     const InternetProxyServer & rData = m_pImpl->getProxy( rProtocol,
@@ -821,8 +821,8 @@ bool InternetProxyDecider::shouldUseProxy( const rtl::OUString & rProtocol,
 
 //=========================================================================
 const InternetProxyServer & InternetProxyDecider::getProxy(
-                                            const rtl::OUString & rProtocol,
-                                            const rtl::OUString & rHost,
+                                            const OUString & rProtocol,
+                                            const OUString & rHost,
                                             sal_Int32 nPort ) const
 {
     return m_pImpl->getProxy( rProtocol, rHost, nPort );
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...