RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals

Conflicts:
cui/source/options/optgdlg.cxx
cui/source/options/webconninfo.cxx
dbaccess/source/ui/app/AppController.cxx

Change-Id: I2abfad91318e8be8c0f77909cbd76825cdca9b85
Reviewed-on: https://gerrit.libreoffice.org/2350
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

21 files changed, 453 insertions, 487 deletions

diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index c4826fe4628c..84c0ce853af4 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -116,7 +116,7 @@ namespace dbmm
         MigrationLog                            aLogger;
         Reference< XOfficeDatabaseDocument >    xDocument;
         Reference< XModel2 >                    xDocumentModel;
-        ::rtl::OUString                         sSuccessfulBackupLocation;
+        OUString                         sSuccessfulBackupLocation;
         bool                                    bMigrationIsRunning;
         bool                                    bMigrationFailure;
         bool                                    bMigrationSuccess;
@@ -398,7 +398,7 @@ namespace dbmm
     {
         bool    lcl_equalURLs_nothrow(
             const Reference< XComponentContext >& context,
-            const ::rtl::OUString& _lhs, const ::rtl::OUString _rhs )
+            const OUString& _lhs, const OUString _rhs )
         {
             // the cheap situation: the URLs are equal
             if ( _lhs == _rhs )
@@ -432,7 +432,7 @@ namespace dbmm
             return false;
 
         SaveDBDocPage& rBackupPage = dynamic_cast< SaveDBDocPage& >( *GetPage( STATE_BACKUP_DBDOC ) );
-        ::rtl::OUString sBackupLocation( rBackupPage.getBackupLocation() );
+        OUString sBackupLocation( rBackupPage.getBackupLocation() );
 
         Any aError;
         try
@@ -478,13 +478,13 @@ namespace dbmm
     //--------------------------------------------------------------------
     void MacroMigrationDialog::impl_reloadDocument_nothrow( bool _bMigrationSuccess )
     {
-        typedef ::std::pair< Reference< XFrame >, ::rtl::OUString > ViewDescriptor;
+        typedef ::std::pair< Reference< XFrame >, OUString > ViewDescriptor;
         ::std::list< ViewDescriptor > aViews;
 
         try
         {
             // the information which is necessary to reload the document
-            ::rtl::OUString                     sDocumentURL ( m_pData->xDocumentModel->getURL()  );
+            OUString                            sDocumentURL ( m_pData->xDocumentModel->getURL()  );
             ::comphelper::NamedValueCollection  aDocumentArgs( m_pData->xDocumentModel->getArgs() );
             if ( !_bMigrationSuccess )
             {
@@ -515,7 +515,7 @@ namespace dbmm
                 aControllers.pop_front();
 
                 Reference< XFrame > xFrame( xController->getFrame(), UNO_SET_THROW );
-                ::rtl::OUString sViewName( xController->getViewControllerName() );
+                OUString sViewName( xController->getViewControllerName() );
 
                 if ( !xController->suspend( sal_True ) )
                 {   // ouch. There shouldn't be any modal dialogs and such, so there
@@ -547,7 +547,7 @@ namespace dbmm
                 aDocumentArgs.put( "ViewName", aView.second );
                 Reference< XInterface > xReloaded( xLoader->loadComponentFromURL(
                     sDocumentURL,
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_self" ) ),
+                    OUString( "_self" ),
                     0,
                     aDocumentArgs.getPropertyValues()
                 ) );
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 33c64b7ba11b..b81e1809e06e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -73,8 +73,8 @@ namespace dbmm
         virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException);
-        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
+        virtual OUString SAL_CALL getImplementationName() throw(RuntimeException);
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
 
         // XInitialization
         virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException);
@@ -88,8 +88,8 @@ namespace dbmm
 
         // helper for factories
         static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
-        static ::rtl::OUString SAL_CALL getImplementationName_static() throw(RuntimeException);
-        static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw(RuntimeException);
+        static OUString SAL_CALL getImplementationName_static() throw(RuntimeException);
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw(RuntimeException);
 
     protected:
         ~MacroMigrationDialogService();
@@ -162,27 +162,27 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static() throw(RuntimeException)
+    OUString SAL_CALL MacroMigrationDialogService::getImplementationName_static() throw(RuntimeException)
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" ) );
+        return OUString( "com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService" );
     }
 
     //--------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() throw(RuntimeException)
+    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames_static() throw(RuntimeException)
     {
-        Sequence< ::rtl::OUString > aServices(1);
-        aServices[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.application.MacroMigrationWizard" ) );
+        Sequence< OUString > aServices(1);
+        aServices[0] = OUString( "com.sun.star.sdb.application.MacroMigrationWizard" );
         return aServices;
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL MacroMigrationDialogService::getImplementationName() throw(RuntimeException)
+    OUString SAL_CALL MacroMigrationDialogService::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
     //--------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames() throw(RuntimeException)
+    Sequence< OUString > SAL_CALL MacroMigrationDialogService::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
@@ -192,7 +192,7 @@ namespace dbmm
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( m_bInitialized )
-            throw AlreadyInitializedException( ::rtl::OUString(), *this );
+            throw AlreadyInitializedException( OUString(), *this );
 
         if ( _rArguments.getLength() != 1 )
             throw IllegalArgumentException(
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 6f7f603bbc52..02d87f0da93c 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -151,11 +151,11 @@ namespace dbmm
     {
         Reference< XCommandProcessor >  xCommandProcessor;
         Reference< XModel >             xDocument;          // valid only temporarily
-        ::rtl::OUString                 sHierarchicalName;
+        OUString                        sHierarchicalName;
         SubDocumentType                 eType;
         size_t                          nNumber;
 
-        SubDocument( const Reference< XCommandProcessor >& _rxCommandProcessor, const ::rtl::OUString& _rName,
+        SubDocument( const Reference< XCommandProcessor >& _rxCommandProcessor, const OUString& _rName,
                 const SubDocumentType _eType, const size_t _nNumber )
             :xCommandProcessor( _rxCommandProcessor )
             ,xDocument()
@@ -177,19 +177,19 @@ namespace dbmm
     namespace
     {
         //----------------------------------------------------------------
-        static const ::rtl::OUString& lcl_getScriptsStorageName()
+        static const OUString& lcl_getScriptsStorageName()
         {
-            static const ::rtl::OUString s_sScriptsStorageName( RTL_CONSTASCII_USTRINGPARAM( "Scripts" ) );
+            static const OUString s_sScriptsStorageName( "Scripts" );
             return s_sScriptsStorageName;
         }
 
         //----------------------------------------------------------------
-        static const ::rtl::OUString& lcl_getScriptsSubStorageName( const ScriptType _eType )
+        static const OUString& lcl_getScriptsSubStorageName( const ScriptType _eType )
         {
-            static const ::rtl::OUString s_sBeanShell ( RTL_CONSTASCII_USTRINGPARAM( "beanshell" ) );
-            static const ::rtl::OUString s_sJavaScript( RTL_CONSTASCII_USTRINGPARAM( "javascript" ) );
-            static const ::rtl::OUString s_sPython    ( RTL_CONSTASCII_USTRINGPARAM( "python" ) );      // TODO: is this correct?
-            static const ::rtl::OUString s_sJava      ( RTL_CONSTASCII_USTRINGPARAM( "java" ) );
+            static const OUString s_sBeanShell ( "beanshell" );
+            static const OUString s_sJavaScript( "javascript" );
+            static const OUString s_sPython    ( "python" );      // TODO: is this correct?
+            static const OUString s_sJava      ( "java" );
 
             switch ( _eType )
             {
@@ -202,12 +202,12 @@ namespace dbmm
             }
 
             OSL_FAIL( "lcl_getScriptsSubStorageName: illegal type!" );
-            static ::rtl::OUString s_sEmpty;
+            static OUString s_sEmpty;
             return s_sEmpty;
         }
 
         //----------------------------------------------------------------
-        static bool lcl_getScriptTypeFromLanguage( const ::rtl::OUString& _rLanguage, ScriptType& _out_rScriptType )
+        static bool lcl_getScriptTypeFromLanguage( const OUString& _rLanguage, ScriptType& _out_rScriptType )
         {
             struct LanguageMapping
             {
@@ -241,9 +241,9 @@ namespace dbmm
         }
 
         //----------------------------------------------------------------
-        ::rtl::OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument )
+        OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument )
         {
-            ::rtl::OUString sObjectName(
+            OUString sObjectName(
                     MacroMigrationResId(
                         _rDocument.eType == eForm ? STR_FORM : STR_REPORT).toString().
                 replaceFirst("$name$", _rDocument.sHierarchicalName));
@@ -259,15 +259,15 @@ namespace dbmm
                 return Any();
 
             Command aCommand;
-            aCommand.Name = ::rtl::OUString::createFromAscii( _pAsciiCommand );
+            aCommand.Name = OUString::createFromAscii( _pAsciiCommand );
             return _rxCommandProc->execute(
                 aCommand, _rxCommandProc->createCommandIdentifier(), NULL );
         }
 
         //----------------------------------------------------------------
-        ::rtl::OUString lcl_getMimeType_nothrow( const Reference< XCommandProcessor >& _rxContent )
+        OUString lcl_getMimeType_nothrow( const Reference< XCommandProcessor >& _rxContent )
         {
-            ::rtl::OUString sMimeType;
+            OUString sMimeType;
             try
             {
                 Reference< XContent > xContent( _rxContent, UNO_QUERY_THROW );
@@ -302,7 +302,7 @@ namespace dbmm
 
                 Reference< XCommandProcessor > xCommandProcessor( _rDocument.xCommandProcessor, UNO_SET_THROW );
                 Command aCommand;
-                aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "openDesign" ) );
+                aCommand.Name = OUString( "openDesign" );
                 aCommand.Argument <<= aLoadArgs.getPropertyValues();
                 Reference< XComponent > xDocComponent(
                     xCommandProcessor->execute(
@@ -619,7 +619,7 @@ namespace dbmm
 
         /** returns the names of the elements in the "Scripts" storage
         */
-        ::std::set< ::rtl::OUString >
+        ::std::set< OUString >
                 getElementNames() const;
 
         /** removes the sub storage for a given script type
@@ -717,7 +717,7 @@ namespace dbmm
         if ( !isValid() )
             return false;
 
-        const ::rtl::OUString& rSubStorageName( lcl_getScriptsSubStorageName( _eType ) );
+        const OUString& rSubStorageName( lcl_getScriptsSubStorageName( _eType ) );
         return  m_xScriptsStorage->hasByName( rSubStorageName )
             &&  m_xScriptsStorage->isStorageElement( rSubStorageName );
     }
@@ -736,17 +736,17 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    ::std::set< ::rtl::OUString > ScriptsStorage::getElementNames() const
+    ::std::set< OUString > ScriptsStorage::getElementNames() const
     {
-        Sequence< ::rtl::OUString > aElementNames;
+        Sequence< OUString > aElementNames;
         if ( isValid() )
             aElementNames = m_xScriptsStorage->getElementNames();
 
-        ::std::set< ::rtl::OUString > aNames;
+        ::std::set< OUString > aNames;
         ::std::copy(
             aElementNames.getConstArray(),
             aElementNames.getConstArray() + aElementNames.getLength(),
-            ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aNames, aNames.end() )
+            ::std::insert_iterator< ::std::set< OUString > >( aNames, aNames.end() )
         );
         return aNames;
     }
@@ -754,7 +754,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     void ScriptsStorage::removeScriptTypeStorage( const ScriptType _eType ) const
     {
-        ::rtl::OUString sSubStorageName( lcl_getScriptsSubStorageName( _eType ) );
+        OUString sSubStorageName( lcl_getScriptsSubStorageName( _eType ) );
         if ( m_xScriptsStorage->hasByName( sSubStorageName ) )
             m_xScriptsStorage->removeElement( sSubStorageName );
     }
@@ -787,8 +787,8 @@ namespace dbmm
     {
     public:
         ProgressDelegator(  IMigrationProgress& _rDelegator,
-                            const ::rtl::OUString& _rObjectName,
-                            const ::rtl::OUString& _rAction
+                            const OUString& _rObjectName,
+                            const OUString& _rAction
                           )
             :m_rDelegator( _rDelegator )
             ,m_sObjectName( _rObjectName )
@@ -815,8 +815,8 @@ namespace dbmm
 
     private:
         IMigrationProgress& m_rDelegator;
-        ::rtl::OUString     m_sObjectName;
-        ::rtl::OUString     m_sAction;
+        OUString     m_sObjectName;
+        OUString     m_sAction;
     };
 
     //====================================================================
@@ -929,9 +929,9 @@ namespace dbmm
         */
         bool    impl_adjustDialogEvents_nothrow(
                     Any& _inout_rDialogLibraryElement,
-                    const ::rtl::OUString& _rDocName,
-                    const ::rtl::OUString& _rDialogLibName,
-                    const ::rtl::OUString& _rDialogName
+                    const OUString& _rDocName,
+                    const OUString& _rDialogLibName,
+                    const OUString& _rDialogName
                 ) const;
 
         /** adjust the document-events which refer to macros/scripts in the document, taking into
@@ -960,8 +960,8 @@ namespace dbmm
                 if and only if adjustments to the script code have been made
         */
         bool    impl_adjustScriptLibrary_nothrow(
-                    const ::rtl::OUString& _rScriptType,
-                    ::rtl::OUString& _inout_rScriptCode
+                    const OUString& _rScriptType,
+                    OUString& _inout_rScriptCode
                 ) const;
 
         bool    impl_adjustScriptLibrary_nothrow( Any& _inout_rScriptDescriptor ) const;
@@ -975,7 +975,7 @@ namespace dbmm
         bool    impl_unprotectPasswordLibrary_throw(
                     const Reference< XLibraryContainerPassword >& _rxPasswordManager,
                     const ScriptType _eScriptType,
-                    const ::rtl::OUString& _rLibraryName
+                    const OUString& _rLibraryName
                 ) const;
     };
 
@@ -1016,9 +1016,9 @@ namespace dbmm
 
         // initialize global progress
         sal_Int32 nOverallRange( m_aSubDocs.size() );
-        rtl::OUString sProgressSkeleton(
+        OUString sProgressSkeleton(
             MacroMigrationResId( STR_OVERALL_PROGRESS).toString().
-            replaceFirst("$overall$", rtl::OUString::valueOf(nOverallRange)));
+            replaceFirst("$overall$", OUString::valueOf(nOverallRange)));
 
         m_rProgress.start( nOverallRange );
 
@@ -1029,9 +1029,9 @@ namespace dbmm
         {
             sal_Int32 nOverallProgressValue( doc - m_aSubDocs.begin() + 1 );
             // update overall progress text
-            ::rtl::OUString sOverallProgress(
+            OUString sOverallProgress(
                 sProgressSkeleton.replaceFirst("$current$",
-                    ::rtl::OUString::valueOf(nOverallProgressValue)));
+                    OUString::valueOf(nOverallProgressValue)));
             m_rProgress.setOverallProgressText( sOverallProgress );
 
             // migrate document
@@ -1057,21 +1057,21 @@ namespace dbmm
     namespace
     {
         void lcl_collectHierarchicalElementNames_throw(
-            const Reference< XNameAccess >& _rxContainer, const ::rtl::OUString& _rContainerLoc,
+            const Reference< XNameAccess >& _rxContainer, const OUString& _rContainerLoc,
             SubDocuments& _out_rDocs, const SubDocumentType _eType, size_t& _io_counter )
         {
-            const ::rtl::OUString sHierarhicalBase(
-                _rContainerLoc.isEmpty() ? ::rtl::OUString() :
-                                           ::rtl::OUStringBuffer( _rContainerLoc ).appendAscii( "/" ).makeStringAndClear());
+            const OUString sHierarhicalBase(
+                _rContainerLoc.isEmpty() ? OUString() :
+                                           OUStringBuffer( _rContainerLoc ).appendAscii( "/" ).makeStringAndClear());
 
-            Sequence< ::rtl::OUString > aElementNames( _rxContainer->getElementNames() );
-            for (   const ::rtl::OUString* elementName = aElementNames.getConstArray();
+            Sequence< OUString > aElementNames( _rxContainer->getElementNames() );
+            for (   const OUString* elementName = aElementNames.getConstArray();
                     elementName != aElementNames.getConstArray() + aElementNames.getLength();
                     ++elementName
                 )
             {
                 Any aElement( _rxContainer->getByName( *elementName ) );
-                ::rtl::OUString sElementName( sHierarhicalBase + *elementName );
+                OUString sElementName( sHierarhicalBase + *elementName );
 
                 Reference< XNameAccess > xSubContainer( aElement, UNO_QUERY );
                 if ( xSubContainer.is() )
@@ -1102,11 +1102,11 @@ namespace dbmm
         {
             Reference< XNameAccess > xDocContainer( m_xDocument->getFormDocuments(), UNO_SET_THROW );
             m_nFormCount = 0;
-            lcl_collectHierarchicalElementNames_throw( xDocContainer, ::rtl::OUString(), m_aSubDocs, eForm, m_nFormCount );
+            lcl_collectHierarchicalElementNames_throw( xDocContainer, OUString(), m_aSubDocs, eForm, m_nFormCount );
 
             xDocContainer.set( m_xDocument->getReportDocuments(), UNO_SET_THROW );
             m_nReportCount = 0;
-            lcl_collectHierarchicalElementNames_throw( xDocContainer, ::rtl::OUString(), m_aSubDocs, eReport, m_nReportCount );
+            lcl_collectHierarchicalElementNames_throw( xDocContainer, OUString(), m_aSubDocs, eReport, m_nReportCount );
         }
         catch( const Exception& )
         {
@@ -1127,12 +1127,12 @@ namespace dbmm
         m_nCurrentDocumentID = m_rLogger.startedDocument( _rDocument.eType, _rDocument.sHierarchicalName );
 
         // start the progress
-        ::rtl::OUString sObjectName( lcl_getSubDocumentDescription( _rDocument ) );
-        m_rProgress.startObject( sObjectName, ::rtl::OUString(), DEFAULT_DOC_PROGRESS_RANGE );
+        OUString sObjectName( lcl_getSubDocumentDescription( _rDocument ) );
+        m_rProgress.startObject( sObjectName, OUString(), DEFAULT_DOC_PROGRESS_RANGE );
 
         // -----------------
         // load the document
-        ::rtl::Reference< ProgressCapture > pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) );
+        Reference< ProgressCapture > pStatusIndicator( new ProgressCapture( sObjectName, m_rProgress ) );
         SubDocument aSubDocument( _rDocument );
         OpenDocResult eResult = lcl_loadSubDocument_nothrow( aSubDocument, pStatusIndicator.get(), m_rLogger );
         if ( eResult != eOpenedDoc )
@@ -1209,13 +1209,13 @@ namespace dbmm
     //--------------------------------------------------------------------
     namespace
     {
-        static ::rtl::OUString lcl_createTargetLibName( const SubDocument& _rDocument,
-            const ::rtl::OUString& _rSourceLibName, const Reference< XNameAccess >& _rxTargetContainer )
+        static OUString lcl_createTargetLibName( const SubDocument& _rDocument,
+            const OUString& _rSourceLibName, const Reference< XNameAccess >& _rxTargetContainer )
         {
             // The new library name is composed from the prefix, the base name, and the old library name.
-            const ::rtl::OUString sPrefix = (_rDocument.eType == eForm)?rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Form_")): rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Report_"));
+            const OUString sPrefix = (_rDocument.eType == eForm)?OUString("Form_"): OUString("Report_");
 
-            ::rtl::OUString sBaseName( _rDocument.sHierarchicalName.copy(
+            OUString sBaseName( _rDocument.sHierarchicalName.copy(
                 _rDocument.sHierarchicalName.lastIndexOf( '/' ) + 1 ) );
             // Normalize this name. In our current storage implementation (and script containers in a document
             // are finally mapped to sub storages of the document storage), not all characters are allowed.
@@ -1242,7 +1242,7 @@ namespace dbmm
             }
             if ( ( nInvalid <= 3 ) && ( nInvalid * 2 <= nValid ) )
             {   // not "too many" invalid => replace them
-                ::rtl::OUStringBuffer aReplacement;
+                OUStringBuffer aReplacement;
                 aReplacement.ensureCapacity( nBaseNameLen );
                 aReplacement.append( sBaseName );
                 const sal_Unicode* pReplacement = aReplacement.getStr();
@@ -1253,12 +1253,12 @@ namespace dbmm
                 }
                 sBaseName = aReplacement.makeStringAndClear();
 
-                ::rtl::OUStringBuffer aNewLibNameAttempt;
+                OUStringBuffer aNewLibNameAttempt;
                 aNewLibNameAttempt.append( sPrefix );
                 aNewLibNameAttempt.append( sBaseName );
                 aNewLibNameAttempt.appendAscii( "_" );
                 aNewLibNameAttempt.append( _rSourceLibName );
-                ::rtl::OUString sTargetName( aNewLibNameAttempt.makeStringAndClear() );
+                OUString sTargetName( aNewLibNameAttempt.makeStringAndClear() );
                 if ( !_rxTargetContainer->hasByName( sTargetName ) )
                     return sTargetName;
             }
@@ -1267,9 +1267,9 @@ namespace dbmm
             // (The latter is valid, since there can be multiple sub documents with the same base name,
             // in different levels in the hierarchy.)
             // In this case, just use the umambiguous sub document number.
-            ::rtl::OUStringBuffer aNewLibName;
+            OUStringBuffer aNewLibName;
             aNewLibName.append( sPrefix );
-            aNewLibName.append( ::rtl::OUString::valueOf( sal_Int64( _rDocument.nNumber ) ) );
+            aNewLibName.append( OUString::valueOf( sal_Int64( _rDocument.nNumber ) ) );
             aNewLibName.appendAscii( "_" );
             aNewLibName.append( _rSourceLibName );
             return aNewLibName.makeStringAndClear();
@@ -1291,7 +1291,7 @@ namespace dbmm
             {   // no scripts at all, or no scripts of the given type
                 return !m_rLogger.hadFailure();
             }
-            ::std::set< ::rtl::OUString > aElementNames( aDocStorage.getElementNames() );
+            ::std::set< OUString > aElementNames( aDocStorage.getElementNames() );
 
             ScriptType aKnownStorageBasedTypes[] = {
                 eBeanShell, eJavaScript, ePython, eJava
@@ -1353,13 +1353,13 @@ namespace dbmm
 
             SharedStorage xScriptsRoot( aDocStorage.getScriptsRoot( _eScriptType ) );
             if ( !xScriptsRoot.is() )
-                throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "internal error" ) ), NULL );
+                throw RuntimeException( OUString( "internal error" ), NULL );
 
             // loop through the script libraries
-            Sequence< ::rtl::OUString > aStorageElements( xScriptsRoot->getElementNames() );
+            Sequence< OUString > aStorageElements( xScriptsRoot->getElementNames() );
             aPhase.start( _nPhaseID, aStorageElements.getLength() );
 
-            for (   const ::rtl::OUString* element = aStorageElements.getConstArray();
+            for (   const OUString* element = aStorageElements.getConstArray();
                     element != aStorageElements.getConstArray() + aStorageElements.getLength();
                     ++element
                 )
@@ -1399,7 +1399,7 @@ namespace dbmm
                 }
 
                 // move the library to the DBDoc's scripts library, under the new name
-                ::rtl::OUString sNewLibName( lcl_createTargetLibName( _rDocument, *element, xTargetStorage.getTyped().get() ) );
+                OUString sNewLibName( lcl_createTargetLibName( _rDocument, *element, xTargetStorage.getTyped().get() ) );
                 xScriptsRoot->moveElementTo( *element, xTargetStorage, sNewLibName );
 
                 // log the fact that we moved the library
@@ -1482,7 +1482,7 @@ namespace dbmm
             OSL_ENSURE( xSourcePasswords.is(),
                 "MigrationEngine_Impl::impl_migrateContainerLibraries_nothrow: suspicious: no password management for the source libraries!" );
 
-            Sequence< ::rtl::OUString > aSourceLibNames( xSourceLibraries->getElementNames() );
+            Sequence< OUString > aSourceLibNames( xSourceLibraries->getElementNames() );
             aPhase.start( _nPhaseID, aSourceLibNames.getLength() );
 
             if ( !xSourceLibraries->hasElements() )
@@ -1506,9 +1506,9 @@ namespace dbmm
             }
 
             // copy all libs to the target, with potentially renaming them
-            const ::rtl::OUString* pSourceLibBegin = aSourceLibNames.getConstArray();
-            const ::rtl::OUString* pSourceLibEnd = pSourceLibBegin + aSourceLibNames.getLength();
-            for (   const ::rtl::OUString* pSourceLibName = pSourceLibBegin;
+            const OUString* pSourceLibBegin = aSourceLibNames.getConstArray();
+            const OUString* pSourceLibEnd = pSourceLibBegin + aSourceLibNames.getLength();
+            for (   const OUString* pSourceLibName = pSourceLibBegin;
                     pSourceLibName != pSourceLibEnd;
                     ++pSourceLibName
                 )
@@ -1531,7 +1531,7 @@ namespace dbmm
                     }
                 }
 
-                ::rtl::OUString sNewLibName( lcl_createTargetLibName( _rDocument, *pSourceLibName, xTargetLibraries.get() ) );
+                OUString sNewLibName( lcl_createTargetLibName( _rDocument, *pSourceLibName, xTargetLibraries.get() ) );
 
                 if ( xSourceLibraries->isLibraryLink( *pSourceLibName ) )
                 {
@@ -1551,8 +1551,8 @@ namespace dbmm
                     Reference< XNameAccess > xSourceLib( xSourceLibraries->getByName( *pSourceLibName ), UNO_QUERY_THROW );
                     Reference< XNameContainer > xTargetLib( xTargetLibraries->createLibrary( sNewLibName ), UNO_QUERY_THROW );
 
-                    Sequence< ::rtl::OUString > aLibElementNames( xSourceLib->getElementNames() );
-                    for (   const ::rtl::OUString* pSourceElementName = aLibElementNames.getConstArray();
+                    Sequence< OUString > aLibElementNames( xSourceLib->getElementNames() );
+                    for (   const OUString* pSourceElementName = aLibElementNames.getConstArray();
                             pSourceElementName != aLibElementNames.getConstArray() + aLibElementNames.getLength();
                             ++pSourceElementName
                         )
@@ -1614,8 +1614,8 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( const ::rtl::OUString& _rScriptType,
-            ::rtl::OUString& _inout_rScriptCode ) const
+    bool MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow( const OUString& _rScriptType,
+            OUString& _inout_rScriptCode ) const
     {
         OSL_PRECOND( !_inout_rScriptCode.isEmpty(), "MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: invalid script!" );
         if ( _inout_rScriptCode.isEmpty() )
@@ -1640,8 +1640,7 @@ namespace dbmm
             Reference< XUriReferenceFactory > xUriRefFac = UriReferenceFactory::create( m_aContext.getUNOContext() );
             Reference< XVndSunStarScriptUrlReference > xUri( xUriRefFac->parse( _inout_rScriptCode ), UNO_QUERY_THROW );
 
-            ::rtl::OUString sScriptLanguage = xUri->getParameter(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "language" ) ) );
+            OUString sScriptLanguage = xUri->getParameter( OUString( "language" ) );
             ScriptType eScriptType = eBasic;
             if ( !lcl_getScriptTypeFromLanguage( sScriptLanguage, eScriptType ) )
             {
@@ -1654,15 +1653,14 @@ namespace dbmm
                 return false;
             }
 
-            ::rtl::OUString sLocation = xUri->getParameter(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "location" ) ) );
+            OUString sLocation = xUri->getParameter( OUString( "location" ) );
             if ( sLocation != "document" )
             {
                 // only document libraries must be migrated, of course
                 return false;
             }
 
-            ::rtl::OUString sScriptName = xUri->getName();
+            OUString sScriptName = xUri->getName();
             sal_Int32 nLibModuleSeparator = sScriptName.indexOf( '.' );
             if ( nLibModuleSeparator < 0 )
             {
@@ -1676,13 +1674,13 @@ namespace dbmm
             }
 
             // replace the library name
-            ::rtl::OUString sLibrary = sScriptName.copy( 0, nLibModuleSeparator );
-            ::rtl::OUString sNewLibName = m_rLogger.getNewLibraryName(
+            OUString sLibrary = sScriptName.copy( 0, nLibModuleSeparator );
+            OUString sNewLibName = m_rLogger.getNewLibraryName(
                 m_nCurrentDocumentID, eScriptType, sLibrary );
             OSL_ENSURE( sLibrary != sNewLibName,
                 "MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: a library which has not been migrated?" );
 
-            ::rtl::OUStringBuffer aNewLocation;
+            OUStringBuffer aNewLocation;
             aNewLocation.append( sNewLibName );
             aNewLocation.append( sScriptName.copy( nLibModuleSeparator ) );
             xUri->setName( aNewLocation.makeStringAndClear() );
@@ -1724,8 +1722,8 @@ namespace dbmm
     {
         ::comphelper::NamedValueCollection aScriptDesc( _inout_rScriptDescriptor );
 
-        ::rtl::OUString sScriptType;
-        ::rtl::OUString sScript;
+        OUString sScriptType;
+        OUString sScript;
         try
         {
             OSL_VERIFY( aScriptDesc.get_ensureType( "EventType", sScriptType ) );
@@ -1759,10 +1757,10 @@ namespace dbmm
                 return true;
 
             Reference< XNameReplace > xEvents( xSuppEvents->getEvents(), UNO_SET_THROW );
-            Sequence< ::rtl::OUString > aEventNames = xEvents->getElementNames();
+            Sequence< OUString > aEventNames = xEvents->getElementNames();
 
             Any aEvent;
-            for (   const ::rtl::OUString* eventName = aEventNames.getConstArray();
+            for (   const OUString* eventName = aEventNames.getConstArray();
                     eventName != aEventNames.getConstArray() + aEventNames.getLength();
                     ++eventName
                 )
@@ -1796,10 +1794,10 @@ namespace dbmm
     {
         Reference< XScriptEventsSupplier > xEventsSupplier( _rxElement, UNO_QUERY_THROW );
         Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
-        Sequence< ::rtl::OUString > aEventNames( xEvents->getElementNames() );
+        Sequence< OUString > aEventNames( xEvents->getElementNames() );
 
-        const ::rtl::OUString* eventName = aEventNames.getArray();
-        const ::rtl::OUString* eventNamesEnd = eventName + aEventNames.getLength();
+        const OUString* eventName = aEventNames.getArray();
+        const OUString* eventNamesEnd = eventName + aEventNames.getLength();
 
         ScriptEventDescriptor aScriptEvent;
         for ( ; eventName != eventNamesEnd; ++eventName )
@@ -1815,7 +1813,7 @@ namespace dbmm
 
     //--------------------------------------------------------------------
     bool MigrationEngine_Impl::impl_adjustDialogEvents_nothrow( Any& _inout_rDialogLibraryElement,
-        const ::rtl::OUString& _rDocName, const ::rtl::OUString& _rDialogLibName, const ::rtl::OUString& _rDialogName ) const
+        const OUString& _rDocName, const OUString& _rDialogLibName, const OUString& _rDialogName ) const
     {
         try
         {
@@ -1830,9 +1828,9 @@ namespace dbmm
             impl_adjustDialogElementEvents_throw( xDialogModel );
 
             // adjust the events of the controls
-            Sequence< ::rtl::OUString > aControlNames( xDialogModel->getElementNames() );
-            const ::rtl::OUString* controlName = aControlNames.getConstArray();
-            const ::rtl::OUString* controlNamesEnd = controlName + aControlNames.getLength();
+            Sequence< OUString > aControlNames( xDialogModel->getElementNames() );
+            const OUString* controlName = aControlNames.getConstArray();
+            const OUString* controlNamesEnd = controlName + aControlNames.getLength();
             for ( ; controlName != controlNamesEnd; ++controlName )
             {
                 impl_adjustDialogElementEvents_throw( Reference< XInterface >( xDialogModel->getByName( *controlName ), UNO_QUERY ) );
@@ -1915,10 +1913,10 @@ namespace dbmm
 
     //--------------------------------------------------------------------
     bool MigrationEngine_Impl::impl_unprotectPasswordLibrary_throw( const Reference< XLibraryContainerPassword >& _rxPasswordManager,
-            const ScriptType _eScriptType, const ::rtl::OUString& _rLibraryName ) const
+            const ScriptType _eScriptType, const OUString& _rLibraryName ) const
     {
         // a human-readable description of the affected library
-        ::rtl::OUString sLibraryDescription(
+        OUString sLibraryDescription(
             MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME).toString().
             replaceFirst("$type$",
                 getScriptTypeDisplayName(_eScriptType)).
@@ -1928,7 +1926,7 @@ namespace dbmm
             // replaceFirst
 
         InteractionHandler aHandler( m_aContext, m_xDocumentModel );
-        ::rtl::OUString sPassword;
+        OUString sPassword;
         while ( true )
         {
             if ( !aHandler.requestDocumentPassword( sLibraryDescription, sPassword ) )
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 18a5d7d62b25..647f63388cb8 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -46,8 +46,8 @@ namespace dbmm
     struct LibraryEntry
     {
         ScriptType      eType;
-        ::rtl::OUString sOldName;
-        ::rtl::OUString sNewName;
+        OUString sOldName;
+        OUString sNewName;
 
         LibraryEntry()
             :eType( eBasic )
@@ -56,7 +56,7 @@ namespace dbmm
         {
         }
 
-        LibraryEntry( const ScriptType& _eType, const ::rtl::OUString& _rOldName, const ::rtl::OUString& _rNewName )
+        LibraryEntry( const ScriptType& _eType, const OUString& _rOldName, const OUString& _rNewName )
             :eType( _eType )
             ,sOldName( _rOldName )
             ,sNewName( _rNewName )
@@ -70,7 +70,7 @@ namespace dbmm
     struct DocumentEntry
     {
         SubDocumentType                 eType;
-        ::rtl::OUString                 sName;
+        OUString                 sName;
         ::std::vector< LibraryEntry >   aMovedLibraries;
 
         DocumentEntry()
@@ -80,7 +80,7 @@ namespace dbmm
         {
         }
 
-        DocumentEntry( const SubDocumentType _eType, const ::rtl::OUString& _rName )
+        DocumentEntry( const SubDocumentType _eType, const OUString& _rName )
             :eType( _eType )
             ,sName( _rName )
         {
@@ -102,7 +102,7 @@ namespace dbmm
     //====================================================================
     struct MigrationLog_Data
     {
-        ::rtl::OUString sBackupLocation;
+        OUString sBackupLocation;
         DocumentLogs    aDocumentLogs;
         ErrorLog        aFailures;
         ErrorLog        aWarnings;
@@ -141,13 +141,13 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void MigrationLog::backedUpDocument( const ::rtl::OUString& _rNewDocumentLocation )
+    void MigrationLog::backedUpDocument( const OUString& _rNewDocumentLocation )
     {
         m_pData->sBackupLocation = _rNewDocumentLocation;
     }
 
     //--------------------------------------------------------------------
-    DocumentID MigrationLog::startedDocument( const SubDocumentType _eType, const ::rtl::OUString& _rName )
+    DocumentID MigrationLog::startedDocument( const SubDocumentType _eType, const OUString& _rName )
     {
 #if OSL_DEBUG_LEVEL > 0
         bool bAlreadyKnown = false;
@@ -172,7 +172,7 @@ namespace dbmm
 
     //--------------------------------------------------------------------
     void MigrationLog::movedLibrary( const DocumentID _nDocID, const ScriptType _eScriptType,
-            const ::rtl::OUString& _rOriginalLibName, const ::rtl::OUString& _rNewLibName )
+            const OUString& _rOriginalLibName, const OUString& _rNewLibName )
     {
         OSL_ENSURE( m_pData->aDocumentLogs.find( _nDocID ) != m_pData->aDocumentLogs.end(),
             "MigrationLog::movedLibrary: document is not known!" );
@@ -193,10 +193,10 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    const ::rtl::OUString& MigrationLog::getNewLibraryName( DocumentID _nDocID, ScriptType _eScriptType,
-        const ::rtl::OUString& _rOriginalLibName ) const
+    const OUString& MigrationLog::getNewLibraryName( DocumentID _nDocID, ScriptType _eScriptType,
+        const OUString& _rOriginalLibName ) const
     {
-        static ::rtl::OUString s_sEmptyString;
+        static OUString s_sEmptyString;
 
         DocumentLogs::const_iterator docPos = m_pData->aDocumentLogs.find( _nDocID );
         if ( docPos == m_pData->aDocumentLogs.end() )
@@ -225,28 +225,25 @@ namespace dbmm
     namespace
     {
         //----------------------------------------------------------------
-        static void lcl_appendErrorDescription( ::rtl::OUStringBuffer& _inout_rBuffer, const MigrationError& _rError )
+        static void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError )
         {
             const sal_Char* pAsciiErrorDescription( NULL );
-            ::std::vector< rtl::OUString > aParameterNames;
+            ::std::vector< OUString > aParameterNames;
             switch ( _rError.eType )
             {
             case ERR_OPENING_SUB_DOCUMENT_FAILED:
                 pAsciiErrorDescription = "opening '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_CLOSING_SUB_DOCUMENT_FAILED:
                 pAsciiErrorDescription = "closing '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_STORAGE_COMMIT_FAILED:
                 pAsciiErrorDescription = "committing the changes for document '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_STORING_DATABASEDOC_FAILED:
@@ -259,66 +256,52 @@ namespace dbmm
 
             case ERR_UNEXPECTED_LIBSTORAGE_ELEMENT:
                 pAsciiErrorDescription = "unexpected #lib# storage element in document '#doc#', named '#element#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#libstore#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#element#")));
+                aParameterNames.push_back(OUString("#doc#"));
+                aParameterNames.push_back(OUString("#libstore#"));
+                aParameterNames.push_back(OUString("#element#"));
                 break;
 
             case ERR_CREATING_DBDOC_SCRIPT_STORAGE_FAILED:
                 pAsciiErrorDescription = "creating the database document's storage for #scripttype# scripts failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#scripttype#")));
+                aParameterNames.push_back(OUString("#scripttype#"));
                 break;
 
             case ERR_COMMITTING_SCRIPT_STORAGES_FAILED:
                 pAsciiErrorDescription = "saving the #scripttype# scripts for document '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#scripttype#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#scripttype#"));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_GENERAL_SCRIPT_MIGRATION_FAILURE:
                 pAsciiErrorDescription = "general error while migrating #scripttype# scripts of document '#doc#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#scripttype#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#scripttype#"));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_GENERAL_MACRO_MIGRATION_FAILURE:
                 pAsciiErrorDescription = "general error during macro migration of document '#doc#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_UNKNOWN_SCRIPT_TYPE:
                 pAsciiErrorDescription = "unknown script type: #type#";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#type#")));
+                aParameterNames.push_back(OUString("#type#"));
                 break;
 
             case ERR_UNKNOWN_SCRIPT_LANGUAGE:
                 pAsciiErrorDescription = "unknown script language: #lang#";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#lang#")));
+                aParameterNames.push_back(OUString("#lang#"));
                 break;
 
             case ERR_UNKNOWN_SCRIPT_NAME_FORMAT:
                 pAsciiErrorDescription = "unknown script name format: #script#";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#script#")));
+                aParameterNames.push_back(OUString("#script#"));
                 break;
 
             case ERR_SCRIPT_TRANSLATION_FAILURE:
                 pAsciiErrorDescription = "analyzing/translating the script URL failed; script type: #type#; script: #code#";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#type#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#code#")));
+                aParameterNames.push_back(OUString("#type#"));
+                aParameterNames.push_back(OUString("#code#"));
                 break;
 
             case ERR_INVALID_SCRIPT_DESCRIPTOR_FORMAT:
@@ -327,72 +310,57 @@ namespace dbmm
 
             case ERR_ADJUSTING_DOCUMENT_EVENTS_FAILED:
                 pAsciiErrorDescription = "adjusting events for document '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_ADJUSTING_DIALOG_EVENTS_FAILED:
                 pAsciiErrorDescription = "adjusting events for dialog #lib#.#dlg# in document '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#lib#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#dlg#")));
+                aParameterNames.push_back(OUString("#doc#"));
+                aParameterNames.push_back(OUString("#lib#"));
+                aParameterNames.push_back(OUString("#dlg#"));
                 break;
 
             case ERR_ADJUSTING_FORMCOMP_EVENTS_FAILED:
                 pAsciiErrorDescription = "adjusting form component events for '#doc#' failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_BIND_SCRIPT_STORAGE_FAILED:
                 pAsciiErrorDescription = "binding to the script storage failed for document '#doc#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_REMOVE_SCRIPTS_STORAGE_FAILED:
                 pAsciiErrorDescription = "removing a scripts storage failed for document '#doc#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_DOCUMENT_BACKUP_FAILED:
                 pAsciiErrorDescription = "backing up the document to #location# failed";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#location#")));
+                aParameterNames.push_back(OUString("#location#"));
                 break;
 
             case ERR_UNKNOWN_SCRIPT_FOLDER:
                 pAsciiErrorDescription = "unknown script folder '#name#' in document '#doc#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#name#")));
+                aParameterNames.push_back(OUString("#doc#"));
+                aParameterNames.push_back(OUString("#name#"));
                 break;
 
             case ERR_EXAMINING_SCRIPTS_FOLDER_FAILED:
                 pAsciiErrorDescription = "examining the 'Scripts' folder failed for document '#doc#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
             case ERR_PASSWORD_VERIFICATION_FAILED:
                 pAsciiErrorDescription = "password verification failed for document '#doc#', #libtype# library '#name#'";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#libtype#")));
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#name#")));
+                aParameterNames.push_back(OUString("#doc#"));
+                aParameterNames.push_back(OUString("#libtype#"));
+                aParameterNames.push_back(OUString("#name#"));
                 break;
 
             case ERR_NEW_STYLE_REPORT:
                 pAsciiErrorDescription = "#doc# could not be processed, since you don't have the Oracle Report Builder (TM) extension installed.";
-                aParameterNames.push_back(
-                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("#doc#")));
+                aParameterNames.push_back(OUString("#doc#"));
                 break;
 
                 // do *not* add a default case here: Without a default, some compilers will warn you when
@@ -401,7 +369,7 @@ namespace dbmm
             OSL_ENSURE( pAsciiErrorDescription, "lcl_appendErrorDescription: no error message!" );
             if ( pAsciiErrorDescription )
             {
-                ::rtl::OUString sSubstituted( ::rtl::OUString::createFromAscii( pAsciiErrorDescription ) );
+                OUString sSubstituted( OUString::createFromAscii( pAsciiErrorDescription ) );
                 OSL_ENSURE( aParameterNames.size() == _rError.aErrorDetails.size(),
                     "lcl_appendErrorDescription: unexpected number of error message parameters!" );
 
@@ -416,7 +384,7 @@ namespace dbmm
         }
 
         //----------------------------------------------------------------
-        void lcl_describeErrors( ::rtl::OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
+        void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
         {
             _rBuffer.appendAscii( "=== " );
             _rBuffer.append     ( String( MacroMigrationResId( _nHeadingResId ) ) );
@@ -458,9 +426,9 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString MigrationLog::getCompleteLog() const
+    OUString MigrationLog::getCompleteLog() const
     {
-        ::rtl::OUStringBuffer aBuffer;
+        OUStringBuffer aBuffer;
 
         if ( !m_pData->sBackupLocation.isEmpty() )
         {
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index a7c48330db81..be6a5a489e8b 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -102,20 +102,20 @@ public:
     DBTypeDetection(const Reference< XMultiServiceFactory >&);
 
     // XServiceInfo
-    ::rtl::OUString                 SAL_CALL getImplementationName() throw(  );
-    sal_Bool                        SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(  );
-    Sequence< ::rtl::OUString >     SAL_CALL getSupportedServiceNames(void) throw(  );
+    OUString                        SAL_CALL getImplementationName() throw(  );
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(  );
+    Sequence< OUString >            SAL_CALL getSupportedServiceNames(void) throw(  );
 
     // static methods
-    static ::rtl::OUString          getImplementationName_Static() throw(  )
+    static OUString                 getImplementationName_Static() throw(  )
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBTypeDetection"));
+        return OUString("org.openoffice.comp.dbflt.DBTypeDetection");
     }
-    static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw(  );
+    static Sequence< OUString> getSupportedServiceNames_Static(void) throw(  );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
             SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
 
-    virtual ::rtl::OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
 };
 // -------------------------------------------------------------------------
 DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFactory)
@@ -123,13 +123,13 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac
 {
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL DBTypeDetection::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL DBTypeDetection::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException)
 {
     try
     {
         ::comphelper::NamedValueCollection aMedia( Descriptor );
         sal_Bool bStreamFromDescr = sal_False;
-        ::rtl::OUString sURL = aMedia.getOrDefault( "URL", ::rtl::OUString() );
+        OUString sURL = aMedia.getOrDefault( "URL", OUString() );
 
         Reference< XInputStream > xInStream( aMedia.getOrDefault( "InputStream",  Reference< XInputStream >() ) );
         Reference< XPropertySet > xStorageProperties;
@@ -141,9 +141,9 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac
         }
         else
         {
-            ::rtl::OUString sSalvagedURL( aMedia.getOrDefault( "SalvagedFile", ::rtl::OUString() ) );
+            OUString sSalvagedURL( aMedia.getOrDefault( "SalvagedFile", OUString() ) );
 
-            ::rtl::OUString sFileLocation( sSalvagedURL.isEmpty() ? sURL : sSalvagedURL );
+            OUString sFileLocation( sSalvagedURL.isEmpty() ? sURL : sSalvagedURL );
             if ( !sFileLocation.isEmpty() )
             {
                 xStorageProperties.set( ::comphelper::OStorageHelper::GetStorageFromURL(
@@ -153,16 +153,16 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac
 
         if ( xStorageProperties.is() )
         {
-            ::rtl::OUString sMediaType;
+            OUString sMediaType;
             xStorageProperties->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType;
             if ( sMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII || sMediaType == MIMETYPE_VND_SUN_XML_BASE_ASCII )
             {
-                if ( bStreamFromDescr && sURL.compareTo( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ), 14 ) != COMPARE_EQUAL )
+                if ( bStreamFromDescr && sURL.compareTo( OUString( "private:stream" ), 14 ) != COMPARE_EQUAL )
                 {
                     // After fixing of the i88522 issue ( use the new file locking for database files ) the stream from the type detection can be used further
                     // for now the file should be reopened to have read/write access
-                    aMedia.remove( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ) ) );
-                    aMedia.remove( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Stream" ) ) );
+                    aMedia.remove( OUString(  "InputStream" ) );
+                    aMedia.remove( OUString(  "Stream" ) );
                     aMedia >>= Descriptor;
                     try
                     {
@@ -176,12 +176,12 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac
                     }
                 }
 
-                return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBase"));
+                return OUString("StarBase");
             }
             ::comphelper::disposeComponent(xStorageProperties);
         }
     } catch(Exception&){}
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMultiServiceFactory >  & rSMgr )
@@ -190,18 +190,18 @@ Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMult
 }
 // -------------------------------------------------------------------------
 // XServiceInfo
-::rtl::OUString SAL_CALL DBTypeDetection::getImplementationName() throw(  )
+OUString SAL_CALL DBTypeDetection::getImplementationName() throw(  )
 {
     return getImplementationName_Static();
 }
 // -------------------------------------------------------------------------
 
 // XServiceInfo
-sal_Bool SAL_CALL DBTypeDetection::supportsService(const ::rtl::OUString& ServiceName) throw(  )
+sal_Bool SAL_CALL DBTypeDetection::supportsService(const OUString& ServiceName) throw(  )
 {
-    Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
-    const ::rtl::OUString * pBegin  = aSNL.getConstArray();
-    const ::rtl::OUString * pEnd    = pBegin + aSNL.getLength();
+    Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString * pBegin  = aSNL.getConstArray();
+    const OUString * pEnd    = pBegin + aSNL.getLength();
     for( ; pBegin != pEnd; ++pBegin)
         if( *pBegin == ServiceName )
             return sal_True;
@@ -209,16 +209,16 @@ sal_Bool SAL_CALL DBTypeDetection::supportsService(const ::rtl::OUString& Servic
 }
 // -------------------------------------------------------------------------
 // XServiceInfo
-Sequence< ::rtl::OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(void) throw(  )
+Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(void) throw(  )
 {
     return getSupportedServiceNames_Static();
 }
 // -------------------------------------------------------------------------
 // ORegistryServiceManager_Static
-Sequence< ::rtl::OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw(  )
+Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw(  )
 {
-    Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection"));
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection");
     return aSNS;
 }
 // -------------------------------------------------------------------------
@@ -233,7 +233,7 @@ class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceIn
 private:
     ::comphelper::ComponentContext      m_aContext;
     Reference< XFrameLoader >           m_xMySelf;
-    ::rtl::OUString                     m_sCurrentURL;
+    OUString                            m_sCurrentURL;
     sal_uLong                               m_nStartWizard;
 
     DECL_LINK( OnStartTableWizard, void* );
@@ -242,21 +242,21 @@ public:
     ~DBContentLoader();
 
     // XServiceInfo
-    ::rtl::OUString                 SAL_CALL getImplementationName() throw(  );
-    sal_Bool                        SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(  );
-    Sequence< ::rtl::OUString >     SAL_CALL getSupportedServiceNames(void) throw(  );
+    OUString                        SAL_CALL getImplementationName() throw(  );
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(  );
+    Sequence< OUString >            SAL_CALL getSupportedServiceNames(void) throw(  );
 
     // static methods
-    static ::rtl::OUString          getImplementationName_Static() throw(  )
+    static OUString                 getImplementationName_Static() throw(  )
     {
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBContentLoader2"));
+        return OUString("org.openoffice.comp.dbflt.DBContentLoader2");
     }
-    static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw(  );
+    static Sequence< OUString > getSupportedServiceNames_Static(void) throw(  );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
             SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
 
     // XLoader
-    virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL,
+    virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const OUString& _rURL,
                                 const Sequence< PropertyValue >& _rArgs,
                                 const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL cancel(void) throw();
@@ -289,18 +289,18 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult
 }
 // -------------------------------------------------------------------------
 // XServiceInfo
-::rtl::OUString SAL_CALL DBContentLoader::getImplementationName() throw(  )
+OUString SAL_CALL DBContentLoader::getImplementationName() throw(  )
 {
     return getImplementationName_Static();
 }
 // -------------------------------------------------------------------------
 
 // XServiceInfo
-sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw(  )
+sal_Bool SAL_CALL DBContentLoader::supportsService(const OUString& ServiceName) throw(  )
 {
-    Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
-    const ::rtl::OUString * pBegin  = aSNL.getConstArray();
-    const ::rtl::OUString * pEnd    = pBegin + aSNL.getLength();
+    Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString * pBegin   = aSNL.getConstArray();
+    const OUString * pEnd     = pBegin + aSNL.getLength();
     for( ; pBegin != pEnd; ++pBegin)
         if( *pBegin == ServiceName )
             return sal_True;
@@ -308,16 +308,16 @@ sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& Servic
 }
 // -------------------------------------------------------------------------
 // XServiceInfo
-Sequence< ::rtl::OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) throw(  )
+Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) throw(  )
 {
     return getSupportedServiceNames_Static();
 }
 // -------------------------------------------------------------------------
 // ORegistryServiceManager_Static
-Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw(  )
+Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw(  )
 {
-    Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.FrameLoader"));
+    Sequence< OUString > aSNS( 1 );
+    aSNS.getArray()[0] = OUString("com.sun.star.frame.FrameLoader");
     return aSNS;
 }
 
@@ -325,7 +325,7 @@ Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(voi
 namespace
 {
     // ...................................................................
-    sal_Bool lcl_urlAllowsInteraction( const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _rURL )
+    sal_Bool lcl_urlAllowsInteraction( const ::comphelper::ComponentContext& _rContext, const OUString& _rURL )
     {
         bool bDoesAllow = sal_False;
         try
@@ -369,13 +369,13 @@ sal_Bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _r
 {
     Sequence< Any > aWizardArgs(2);
     aWizardArgs[0] <<= PropertyValue(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")),
+                    OUString("ParentWindow"),
                     0,
                     makeAny( lcl_getTopMostWindow( m_aContext.getUNOContext() ) ),
                     PropertyState_DIRECT_VALUE);
 
     aWizardArgs[1] <<= PropertyValue(
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")),
+                    OUString("InitialSelection"),
                     0,
                     makeAny( _rxModel ),
                     PropertyState_DIRECT_VALUE);
@@ -390,13 +390,13 @@ sal_Bool DBContentLoader::impl_executeNewDatabaseWizard( Reference< XModel >& _r
 
     Reference<XPropertySet> xProp(xAdminDialog,UNO_QUERY);
     sal_Bool bSuccess = sal_False;
-    xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenDatabase"))) >>= bSuccess;
-    xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartTableWizard"))) >>= _bShouldStartTableWizard;
+    xProp->getPropertyValue(OUString("OpenDatabase")) >>= bSuccess;
+    xProp->getPropertyValue(OUString("StartTableWizard")) >>= _bShouldStartTableWizard;
     return bSuccess;
 }
 
 // -----------------------------------------------------------------------
-void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::rtl::OUString& _rURL,
+void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OUString& _rURL,
         const Sequence< PropertyValue >& rArgs,
         const Reference< XLoadEventListener > & rListener) throw(::com::sun::star::uno::RuntimeException)
 {
@@ -411,7 +411,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
     }
 
     Reference< XModel > xModel       = aMediaDesc.getOrDefault( "Model", Reference< XModel >() );
-    ::rtl::OUString     sSalvagedURL = aMediaDesc.getOrDefault( "SalvagedFile", _rURL );
+    OUString            sSalvagedURL = aMediaDesc.getOrDefault( "SalvagedFile", _rURL );
 
     sal_Bool bCreateNew = sal_False;        // does the URL denote the private:factory URL?
     sal_Bool bStartTableWizard = sal_False; // start the table wizard after everything was loaded successfully?
@@ -436,7 +436,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
     aMediaDesc.remove( "Model" );
 
     // also, it's allowed to specify the type of view which should be created
-    ::rtl::OUString sViewName = aMediaDesc.getOrDefault( "ViewName", ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Default" ) ) );
+    OUString sViewName = aMediaDesc.getOrDefault( "ViewName", OUString( "Default" ) );
     aMediaDesc.remove( "ViewName" );
 
     sal_Int32 nInitialSelection = -1;
@@ -444,7 +444,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
     {
         Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(m_aContext.getUNOContext()) );
 
-        ::rtl::OUString sFactoryName = SvtModuleOptions().GetFactoryEmptyDocumentURL(SvtModuleOptions::E_DATABASE);
+        OUString sFactoryName = SvtModuleOptions().GetFactoryEmptyDocumentURL(SvtModuleOptions::E_DATABASE);
         bCreateNew = sFactoryName.match(_rURL);
 
         Reference< XDocumentDataSource > xDocumentDataSource;
@@ -457,7 +457,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
         else
         {
             ::comphelper::NamedValueCollection aCreationArgs;
-            aCreationArgs.put( (::rtl::OUString)INFO_POOLURL, sSalvagedURL );
+            aCreationArgs.put( (OUString)INFO_POOLURL, sSalvagedURL );
             xDocumentDataSource.set( xDatabaseContext->createInstanceWithArguments( aCreationArgs.getWrappedNamedValues() ), UNO_QUERY_THROW );
         }
 
@@ -593,14 +593,14 @@ IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ )
     {
         Sequence< Any > aWizArgs(1);
         PropertyValue aValue;
-        aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseLocation"));
+        aValue.Name = OUString("DatabaseLocation");
         aValue.Value <<= m_sCurrentURL;
         aWizArgs[0] <<= aValue;
 
         SolarMutexGuard aGuard;
         Reference< XJobExecutor > xTableWizard;
         if ( m_aContext.createComponentWithArguments( "com.sun.star.wizards.table.CallTableWizard", aWizArgs, xTableWizard ) )
-            xTableWizard->trigger(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("start")));
+            xTableWizard->trigger(OUString("start"));
     }
     catch(const Exception&)
     {
@@ -621,17 +621,17 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey)
     Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
 
     // register content loader for dispatch
-    ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/"));
+    OUString aImpl("/");
     aImpl += ::dbaxml::DBContentLoader::getImplementationName_Static();
 
-    ::rtl::OUString aImpltwo = aImpl;
-    aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/Loader"));
+    OUString aImpltwo = aImpl;
+    aImpltwo += OUString("/UNO/Loader");
     Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
     aImpltwo = aImpl;
-    aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Loader"));
+    aImpltwo += OUString("/Loader");
     Reference< XRegistryKey >  xLoaderKey = xKey->createKey( aImpltwo );
-    xNewKey = xLoaderKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")) );
-    xNewKey->setAsciiValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdatabase")) );
+    xNewKey = xLoaderKey->createKey( OUString("Pattern") );
+    xNewKey->setAsciiValue( OUString("private:factory/sdatabase") );
 }
 // -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index 68f3828ed22a..6eb80095828d 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -34,7 +34,7 @@ namespace dbaxml
 DBG_NAME(OXMLConnectionResource)
 
 OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
-                sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName,
+                sal_uInt16 nPrfx, const OUString& _sLocalName,
                 const Reference< XAttributeList > & _xAttrList) :
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
 {
@@ -51,12 +51,12 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
     const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        const OUString sAttrName = _xAttrList->getNameByIndex( i );
         const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        const OUString sValue = _xAttrList->getValueByIndex( i );
 
-        aProperty.Name = ::rtl::OUString();
+        aProperty.Name = OUString();
         aProperty.Value = Any();
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
@@ -75,10 +75,10 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
                 aProperty.Name = PROPERTY_TYPE;
                 break;
             case XML_TOK_SHOW:
-                aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Show"));
+                aProperty.Name = OUString("Show");
                 break;
             case XML_TOK_ACTUATE:
-                aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Actuate"));
+                aProperty.Name = OUString("Actuate");
                 break;
         }
         if ( !aProperty.Name.isEmpty() )
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index ba45e38f575a..9b62d4d02beb 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -40,7 +40,7 @@ namespace dbaxml
 DBG_NAME(OXMLDataSource)
 
 OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
-                sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName,
+                sal_uInt16 nPrfx, const OUString& _sLocalName,
                 const Reference< XAttributeList > & _xAttrList, const UsedFor _eUsedFor ) :
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
 {
@@ -59,15 +59,15 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
     bool bFoundSuppressVersionColumns = false;
 
     const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0;
-    static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+    static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        OUString sAttrName = _xAttrList->getNameByIndex( i );
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        OUString sValue = _xAttrList->getValueByIndex( i );
 
-        aProperty.Name = ::rtl::OUString();
+        aProperty.Name = OUString();
         aProperty.Value = Any();
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
@@ -156,7 +156,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
                 aProperty.Value <<= sValue.toInt32();
                 break;
             case XML_TOK_JAVA_CLASSPATH:
-                aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClassPath"));
+                aProperty.Name = OUString("JavaDriverClassPath");
                 break;
         }
         if ( !aProperty.Name.isEmpty() )
@@ -210,7 +210,7 @@ OXMLDataSource::~OXMLDataSource()
 
 SvXMLImportContext* OXMLDataSource::CreateChildContext(
         sal_uInt16 nPrefix,
-        const ::rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const Reference< XAttributeList > & xAttrList )
 {
     SvXMLImportContext *pContext = 0;
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index eb20f5cd2af5..1a0704b237c1 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -37,7 +37,7 @@ DBG_NAME(OXMLDataSourceInfo)
 
 OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
                 ,sal_uInt16 nPrfx
-                ,const ::rtl::OUString& _sLocalName
+                ,const OUString& _sLocalName
                 ,const Reference< XAttributeList > & _xAttrList
                 ,const sal_uInt16 _nToken) :
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
@@ -55,12 +55,12 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
     ::std::vector< sal_uInt16 > aTokens;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        OUString sAttrName = _xAttrList->getNameByIndex( i );
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        OUString sValue = _xAttrList->getValueByIndex( i );
 
-        aProperty.Name = ::rtl::OUString();
+        aProperty.Name = OUString();
 
         sal_uInt16 nToken = rTokenMap.Get( nPrefix, sLocalName );
         aTokens.push_back(nToken);
@@ -112,20 +112,20 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
             if ( !bFoundField )
             {
                 aProperty.Name = INFO_FIELDDELIMITER;
-                aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+                aProperty.Value <<= OUString(";");
                 rImport.addInfo(aProperty);
             }
             if ( !bFoundThousand )
             {
                 aProperty.Name = INFO_THOUSANDSDELIMITER;
-                aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+                aProperty.Value <<= OUString(",");
                 rImport.addInfo(aProperty);
             }
         }
         if ( XML_TOK_FONT_CHARSET == _nToken && !bFoundCharset )
         {
             aProperty.Name = INFO_CHARSET;
-            aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("utf8"));
+            aProperty.Value <<= OUString("utf8");
             rImport.addInfo(aProperty);
         }
     }
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 37a14e8aefcb..15e1254c50dd 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -42,11 +42,11 @@ DBG_NAME(OXMLHierarchyCollection)
 
 OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
                 ,sal_uInt16 nPrfx
-                ,const ::rtl::OUString& _sLocalName
+                ,const OUString& _sLocalName
                 ,const Reference< XAttributeList > & _xAttrList
                 ,const Reference< XNameAccess >& _xParentContainer
-                ,const ::rtl::OUString& _sCollectionServiceName
-                ,const ::rtl::OUString& _sComponentServiceName) :
+                ,const OUString& _sCollectionServiceName
+                ,const OUString& _sComponentServiceName) :
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
     ,m_xParentContainer(_xParentContainer)
     ,m_sCollectionServiceName(_sCollectionServiceName)
@@ -60,10 +60,10 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
     sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        OUString sAttrName = _xAttrList->getNameByIndex( i );
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        OUString sValue = _xAttrList->getValueByIndex( i );
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
         {
@@ -79,11 +79,11 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
             Sequence< Any > aArguments(2);
             PropertyValue aValue;
             // set as folder
-            aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+            aValue.Name = OUString("Name");
             aValue.Value <<= m_sName;
             aArguments[0] <<= aValue;
             //parent
-            aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent"));
+            aValue.Name = OUString("Parent");
             aValue.Value <<= _xParentContainer;
             aArguments[1] <<= aValue;
 
@@ -105,7 +105,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
 // -----------------------------------------------------------------------------
 OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
                 ,sal_uInt16 nPrfx
-                ,const ::rtl::OUString& _sLocalName
+                ,const OUString& _sLocalName
                 ,const Reference< XNameAccess >& _xContainer
                 ,const Reference< XPropertySet >& _xTable
             ) :
@@ -125,7 +125,7 @@ OXMLHierarchyCollection::~OXMLHierarchyCollection()
 // -----------------------------------------------------------------------------
 SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
         sal_uInt16 nPrefix,
-        const ::rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const Reference< XAttributeList > & xAttrList )
 {
     SvXMLImportContext *pContext = 0;
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index 1fb841a209e8..eb0503ffbf79 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -37,7 +37,7 @@ namespace dbaxml
 DBG_NAME(OXMLLogin)
 
 OXMLLogin::OXMLLogin( ODBFilter& rImport,
-                sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName,
+                sal_uInt16 nPrfx, const OUString& _sLocalName,
                 const Reference< XAttributeList > & _xAttrList ) :
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
 {
@@ -50,14 +50,14 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
     Reference<XPropertySet> xDataSource(rImport.getDataSource());
 
     const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0;
-    static const ::rtl::OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
+    static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
     bool bUserFound = false;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        OUString sAttrName = _xAttrList->getNameByIndex( i );
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        OUString sValue = _xAttrList->getValueByIndex( i );
 
         try
         {
@@ -92,7 +92,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
                     {
                         bUserFound = true;
                         PropertyValue aProperty;
-                        aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSystemUser"));
+                        aProperty.Name = OUString("UseSystemUser");
                         aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
                         rImport.addInfo(aProperty);
                     }
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 3daafca914fe..dec5d0e1ad8f 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -34,7 +34,7 @@ namespace dbaxml
 DBG_NAME(OXMLServerDatabase)
 
 OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
-                sal_uInt16 nPrfx, const ::rtl::OUString& _sLocalName,
+                sal_uInt16 nPrfx, const OUString& _sLocalName,
                 const Reference< XAttributeList > & _xAttrList) :
     SvXMLImportContext( rImport, nPrfx, _sLocalName )
 {
@@ -49,13 +49,13 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
     PropertyValue aProperty;
 
     const sal_Int16 nLength = (xDataSource.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0;
-    ::rtl::OUString sType,sHostName,sPortNumber,sDatabaseName;
+    OUString sType,sHostName,sPortNumber,sDatabaseName;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        const OUString sAttrName = _xAttrList->getNameByIndex( i );
         const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        const rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        const OUString sValue = _xAttrList->getValueByIndex( i );
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
         {
@@ -69,7 +69,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
                 sPortNumber = sValue;
                 break;
             case XML_TOK_LOCAL_SOCKET:
-                aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket"));
+                aProperty.Name = OUString("LocalSocket");
                 aProperty.Value <<= sValue;
                 rImport.addInfo(aProperty);
                 break;
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index e1b017777da1..b1a27920e7c0 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -60,11 +60,11 @@ TYPEINIT1( OTableStylesContext, SvXMLStylesContext );
 DBG_NAME(OTableStyleContext)
 
 OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
-        sal_uInt16 nPrfx, const ::rtl::OUString& rLName,
+        sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList > & xAttrList,
         SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle )
     :XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle )
-    ,sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")))
+    ,sNumberFormat(OUString("NumberFormat"))
     ,pStyles(&rStyles)
     ,m_nNumberFormat(-1)
 {
@@ -138,8 +138,8 @@ void OTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any&
 }
 // -----------------------------------------------------------------------------
 void OTableStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
-                                        const ::rtl::OUString& rLocalName,
-                                        const ::rtl::OUString& rValue )
+                                        const OUString& rLocalName,
+                                        const OUString& rValue )
 {
     // TODO: use a map here
     if( IsXMLToken(rLocalName, XML_DATA_STYLE_NAME ) )
@@ -159,13 +159,13 @@ DBG_NAME(OTableStylesContext)
 
 OTableStylesContext::OTableStylesContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx ,
-        const ::rtl::OUString& rLName ,
+        const OUString& rLName ,
         const Reference< XAttributeList > & xAttrList,
         const sal_Bool bTempAutoStyles ) :
     SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
-    sTableStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))),
-    sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))),
-    sCellStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))),
+    sTableStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )),
+    sColumnStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
+    sCellStyleServiceName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )),
     m_nNumberFormatIndex(-1),
     bAutoStyles(bTempAutoStyles)
 {
@@ -229,7 +229,7 @@ UniReference < SvXMLImportPropertyMapper >
 }
 // ----------------------------------------------------------------------------
 SvXMLStyleContext *OTableStylesContext::CreateStyleStyleChildContext(
-        sal_uInt16 nFamily, sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
+        sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
 {
     SvXMLStyleContext *pStyle = SvXMLStylesContext::CreateStyleStyleChildContext( nFamily, nPrefix,
@@ -259,9 +259,9 @@ Reference < XNameContainer >
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
+OUString OTableStylesContext::GetServiceName( sal_uInt16 nFamily ) const
 {
-    rtl::OUString sServiceName = SvXMLStylesContext::GetServiceName(nFamily);
+    OUString sServiceName = SvXMLStylesContext::GetServiceName(nFamily);
     if (sServiceName.isEmpty())
     {
         switch( nFamily )
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 994d1cfaddb8..bac9efbde09a 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -42,10 +42,10 @@ DBG_NAME(OXMLTable)
 
 OXMLTable::OXMLTable( ODBFilter& _rImport
                 ,sal_uInt16 nPrfx
-                ,const ::rtl::OUString& _sLocalName
+                ,const OUString& _sLocalName
                 ,const uno::Reference< XAttributeList > & _xAttrList
                 ,const uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer
-                ,const ::rtl::OUString& _sServiceName
+                ,const OUString& _sServiceName
                 )
     :SvXMLImportContext( _rImport, nPrfx, _sLocalName )
     ,m_xParentContainer(_xParentContainer)
@@ -62,10 +62,10 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
     sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        OUString sAttrName = _xAttrList->getNameByIndex( i );
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        OUString sValue = _xAttrList->getValueByIndex( i );
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
         {
@@ -92,11 +92,11 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
     Sequence< Any > aArguments(2);
     PropertyValue aValue;
     // set as folder
-    aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+    aValue.Name = OUString("Name");
     aValue.Value <<= m_sName;
     aArguments[0] <<= aValue;
     //parent
-    aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Parent"));
+    aValue.Name = OUString("Parent");
     aValue.Value <<= m_xParentContainer;
     aArguments[1] <<= aValue;
     m_xTable.set(
@@ -113,7 +113,7 @@ OXMLTable::~OXMLTable()
 // -----------------------------------------------------------------------------
 SvXMLImportContext* OXMLTable::CreateChildContext(
         sal_uInt16 nPrefix,
-        const ::rtl::OUString& rLocalName,
+        const OUString& rLocalName,
         const uno::Reference< XAttributeList > & xAttrList )
 {
     SvXMLImportContext *pContext = 0;
@@ -124,14 +124,14 @@ SvXMLImportContext* OXMLTable::CreateChildContext(
         case XML_TOK_FILTER_STATEMENT:
             {
                 GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                ::rtl::OUString s1,s2,s3;
+                OUString s1,s2,s3;
                 fillAttributes(nPrefix, rLocalName,xAttrList,m_sFilterStatement,s1,s2,s3);
             }
             break;
         case XML_TOK_ORDER_STATEMENT:
             {
                 GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
-                ::rtl::OUString s1,s2,s3;
+                OUString s1,s2,s3;
                 fillAttributes(nPrefix, rLocalName,xAttrList,m_sOrderStatement,s1,s2,s3);
             }
             break;
@@ -217,12 +217,12 @@ void OXMLTable::EndElement()
 }
 // -----------------------------------------------------------------------------
 void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/
-                                ,const ::rtl::OUString& /*_sLocalName*/
+                                ,const OUString& /*_sLocalName*/
                                 ,const uno::Reference< XAttributeList > & _xAttrList
-                                , ::rtl::OUString& _rsCommand
-                                ,::rtl::OUString& _rsTableName
-                                ,::rtl::OUString& _rsTableSchema
-                                ,::rtl::OUString& _rsTableCatalog
+                                ,OUString& _rsCommand
+                                ,OUString& _rsTableName
+                                ,OUString& _rsTableSchema
+                                ,OUString& _rsTableCatalog
                                 )
 {
     OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
@@ -232,10 +232,10 @@ void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/
     sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
     for(sal_Int16 i = 0; i < nLength; ++i)
     {
-        ::rtl::OUString sLocalName;
-        rtl::OUString sAttrName = _xAttrList->getNameByIndex( i );
+        OUString sLocalName;
+        OUString sAttrName = _xAttrList->getNameByIndex( i );
         sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
-        rtl::OUString sValue = _xAttrList->getValueByIndex( i );
+        OUString sValue = _xAttrList->getValueByIndex( i );
 
         switch( rTokenMap.Get( nPrefix, sLocalName ) )
         {
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 183d58b6abc9..2fcca35c3d87 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -126,7 +126,7 @@ namespace dbaxml
                     try
                     {
                         uno::Reference<frame::XDesktop2> xDesktop = frame::Desktop::create( m_xContext );
-                        const ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank"));
+                        const OUString sTarget("_blank");
                         sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE;
                         uno::Reference< frame::XFrame> xFrame = xDesktop->findFrame(sTarget,nFrameSearchFlag);
                         uno::Reference<frame::XComponentLoader> xFrameLoad(xFrame,uno::UNO_QUERY);
@@ -135,20 +135,20 @@ namespace dbaxml
                         {
                             uno::Sequence < beans::PropertyValue > aArgs( 3);
                             sal_Int32 nLen = 0;
-                            aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
+                            aArgs[nLen].Name = OUString("AsTemplate");
                             aArgs[nLen++].Value <<= sal_False;
 
-                            aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+                            aArgs[nLen].Name = OUString("ReadOnly");
                             aArgs[nLen++].Value <<= sal_True;
 
-                            aArgs[nLen].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
+                            aArgs[nLen].Name = OUString("Hidden");
                             aArgs[nLen++].Value <<= sal_True;
 
                             ::comphelper::MimeConfigurationHelper aHelper( m_xContext );
                             SvtModuleOptions aModuleOptions;
                             uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL(
                                 aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET) )),
-                                ::rtl::OUString(), // empty frame name
+                                OUString(), // empty frame name
                                 0,
                                 aArgs
                                 ),uno::UNO_QUERY);
@@ -180,7 +180,7 @@ namespace dbaxml
             // XPropertyChangeListener
             virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& _rEvent ) throw (uno::RuntimeException)
             {
-                ::rtl::OUString sURL;
+                OUString sURL;
                 _rEvent.NewValue >>= sURL;
                 FastLoader* pCreatorThread = NULL;
 
@@ -252,9 +252,9 @@ sal_Int32 ReadThroughComponent(
     catch (const SAXParseException& r)
     {
 #if OSL_DEBUG_LEVEL > 1
-        ::rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
-            "SAX parse exception catched while importing:\n"));
-        aError.append(rtl::OUStringToOString(r.Message,
+        OStringBuffer aError(
+            "SAX parse exception catched while importing:\n");
+        aError.append(OUStringToOString(r.Message,
             RTL_TEXTENCODING_ASCII_US));
         aError.append(r.LineNumber);
         aError.append(',');
@@ -302,7 +302,7 @@ sal_Int32 ReadThroughComponent(
         try
         {
             // open stream (and set parser input)
-        ::rtl::OUString sStreamName = ::rtl::OUString::createFromAscii(pStreamName);
+        OUString sStreamName = OUString::createFromAscii(pStreamName);
             if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) )
             {
                 // stream name not found! Then try the compatibility name.
@@ -313,7 +313,7 @@ sal_Int32 ReadThroughComponent(
                     return 0;
 
                 // if so, does the stream exist?
-                sStreamName = ::rtl::OUString::createFromAscii(pCompatibilityStreamName);
+                sStreamName = OUString::createFromAscii(pCompatibilityStreamName);
                 if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) )
                     return 0;
             }
@@ -322,7 +322,7 @@ sal_Int32 ReadThroughComponent(
             xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ );
 
             uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW );
-            uno::Any aAny = xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) );
+            uno::Any aAny = xProps->getPropertyValue( OUString("Encrypted" ) );
             aAny >>= bEncrypted;
         }
         catch (const packages::WrongPasswordException&)
@@ -365,11 +365,11 @@ ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
 
     GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_10TH);
     GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
-    GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__db) ),
+    GetNamespaceMap().Add( OUString ( sXML_np__db ),
                         GetXMLToken(XML_N_DB),
                         XML_NAMESPACE_DB );
 
-    GetNamespaceMap().Add( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np___db) ),
+    GetNamespaceMap().Add( OUString ( sXML_np___db ),
                         GetXMLToken(XML_N_DB_OASIS),
                         XML_NAMESPACE_DB );
 }
@@ -424,10 +424,10 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
 sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException)
 {
-    ::rtl::OUString sFileName;
+    OUString sFileName;
     ::comphelper::NamedValueCollection aMediaDescriptor( rDescriptor );
     if ( aMediaDescriptor.has( "URL" ) )
-        sFileName = aMediaDescriptor.getOrDefault( "URL", ::rtl::OUString() );
+        sFileName = aMediaDescriptor.getOrDefault( "URL", OUString() );
     if ( sFileName.isEmpty() && aMediaDescriptor.has( "FileName" ) )
         sFileName = aMediaDescriptor.getOrDefault( "FileName", sFileName );
 
@@ -450,7 +450,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
             Any aError = ::cppu::getCaughtException();
             if  ( aError.isExtractableTo( ::cppu::UnoType< RuntimeException >::get() ) )
                 throw;
-            throw lang::WrappedTargetRuntimeException( ::rtl::OUString(), *this, aError );
+            throw lang::WrappedTargetRuntimeException( OUString(), *this, aError );
         }
 
         uno::Reference<sdb::XOfficeDatabaseDocument> xOfficeDoc(GetModel(),UNO_QUERY_THROW);
@@ -508,7 +508,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
 }
 // -----------------------------------------------------------------------------
 SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
-                                      const ::rtl::OUString& rLocalName,
+                                      const OUString& rLocalName,
                                       const uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
 {
     SvXMLImportContext *pContext = 0;
@@ -827,7 +827,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
     return *m_pColumnElemTokenMap;
 }
 // -----------------------------------------------------------------------------
-SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const ::rtl::OUString& rLocalName,
+SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUString& rLocalName,
                                      const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle )
 {
     SvXMLImportContext *pContext = NULL;
@@ -842,7 +842,7 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const ::r
     return pContext;
 }
 // -----------------------------------------------------------------------------
-SvXMLImportContext* ODBFilter::CreateScriptContext( const ::rtl::OUString& _rLocalName )
+SvXMLImportContext* ODBFilter::CreateScriptContext( const OUString& _rLocalName )
 {
     return new XMLScriptContext( *this, XML_NAMESPACE_OFFICE, _rLocalName, GetModel() );
 }
@@ -881,7 +881,7 @@ void ODBFilter::setPropertyInfo()
         return;
 
     ::connectivity::DriversConfig aDriverConfig(GetComponentContext());
-    const ::rtl::OUString sURL = ::comphelper::getString(xDataSource->getPropertyValue(PROPERTY_URL));
+    const OUString sURL = ::comphelper::getString(xDataSource->getPropertyValue(PROPERTY_URL));
     ::comphelper::NamedValueCollection aDataSourceSettings = aDriverConfig.getProperties( sURL );
 
     Sequence<PropertyValue> aInfo;
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 330a86c158dc..29798eea5769 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -90,7 +90,7 @@ namespace sdbtools
         return new DataSourceMetaData( getContext(), getConnection() );
     }
     //--------------------------------------------------------------------
-    Reference< container::XNameAccess > SAL_CALL ConnectionTools::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, Reference< lang::XComponent >& keepFieldsAlive ) throw (sdbc::SQLException, RuntimeException)
+    Reference< container::XNameAccess > SAL_CALL ConnectionTools::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, Reference< lang::XComponent >& keepFieldsAlive ) throw (sdbc::SQLException, RuntimeException)
     {
         EntryGuard aGuard( *this );
         ::dbtools::SQLExceptionInfo aErrorInfo;
@@ -100,7 +100,7 @@ namespace sdbtools
         return xRet;
     }
     //--------------------------------------------------------------------
-    Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException)
+    Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException)
     {
         EntryGuard aGuard( *this );
         dbtools::StatementComposer aComposer(getConnection(), command, commandType, sal_True );
@@ -109,37 +109,37 @@ namespace sdbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ConnectionTools::getImplementationName() throw (RuntimeException)
+    OUString SAL_CALL ConnectionTools::getImplementationName() throw (RuntimeException)
     {
         return getImplementationName_static();
     }
 
     //--------------------------------------------------------------------
-    ::sal_Bool SAL_CALL ConnectionTools::supportsService(const ::rtl::OUString & _ServiceName) throw (RuntimeException)
+    ::sal_Bool SAL_CALL ConnectionTools::supportsService(const OUString & _ServiceName) throw (RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() );
-        const ::rtl::OUString* begin = aSupported.getConstArray();
-        const ::rtl::OUString* end = aSupported.getConstArray() + aSupported.getLength();
+        Sequence< OUString > aSupported( getSupportedServiceNames() );
+        const OUString* begin = aSupported.getConstArray();
+        const OUString* end = aSupported.getConstArray() + aSupported.getLength();
         return ::std::find( begin, end, _ServiceName ) != end;
     }
 
     //--------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException)
+    Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ConnectionTools::getImplementationName_static()
+    OUString SAL_CALL ConnectionTools::getImplementationName_static()
     {
-        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dbaccess.ConnectionTools" ) );
+        return OUString( "com.sun.star.comp.dbaccess.ConnectionTools" );
     }
 
     //--------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static()
+    Sequence< OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static()
     {
-        Sequence< ::rtl::OUString > aSupported( 1 );
-        aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.tools.ConnectionTools" ) );
+        Sequence< OUString > aSupported( 1 );
+        aSupported[0] = OUString( "com.sun.star.sdb.tools.ConnectionTools" );
         return aSupported;
     }
 
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index edad066c1c1a..05c1db065b27 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -71,8 +71,8 @@ namespace sdbtools
     class INameValidation
     {
     public:
-        virtual bool validateName( const ::rtl::OUString& _rName ) = 0;
-        virtual void validateName_throw( const ::rtl::OUString& _rName ) = 0;
+        virtual bool validateName( const OUString& _rName ) = 0;
+        virtual void validateName_throw( const OUString& _rName ) = 0;
 
         virtual ~INameValidation() { }
     };
@@ -98,12 +98,12 @@ namespace sdbtools
         }
 
         // INameValidation
-        virtual bool validateName( const ::rtl::OUString& _rName )
+        virtual bool validateName( const OUString& _rName )
         {
             return !m_xContainer->hasByName( _rName );
         }
 
-        virtual void validateName_throw( const ::rtl::OUString& _rName )
+        virtual void validateName_throw( const OUString& _rName )
         {
             if ( validateName( _rName ) )
                 return;
@@ -115,7 +115,7 @@ namespace sdbtools
             if ( aMeta.supportsSubqueriesInFrom() )
             {
                 String sNeedDistinctNames( SdbtRes( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) );
-                aError.NextException <<= SQLException( sNeedDistinctNames, m_xConnection, ::rtl::OUString(), 0, Any() );
+                aError.NextException <<= SQLException( sNeedDistinctNames, m_xConnection, OUString(), 0, Any() );
             }
 
             throw aError;
@@ -137,17 +137,17 @@ namespace sdbtools
         {
         }
 
-        virtual bool validateName( const ::rtl::OUString& _rName )
+        virtual bool validateName( const OUString& _rName )
         {
             ::dbtools::DatabaseMetaData aMeta( m_xConnection );
             if  ( !aMeta.restrictIdentifiersToSQL92() )
                 return true;
 
-            ::rtl::OUString sCatalog, sSchema, sName;
+            OUString sCatalog, sSchema, sName;
             ::dbtools::qualifiedNameComponents(
                 m_xConnection->getMetaData(), _rName, sCatalog, sSchema, sName, ::dbtools::eInTableDefinitions );
 
-            ::rtl::OUString sExtraNameCharacters( m_xConnection->getMetaData()->getExtraNameCharacters() );
+            OUString sExtraNameCharacters( m_xConnection->getMetaData()->getExtraNameCharacters() );
             if  (   ( !sCatalog.isEmpty() && !::dbtools::isValidSQLName( sCatalog, sExtraNameCharacters ) )
                 ||  ( !sSchema.isEmpty() && !::dbtools::isValidSQLName( sSchema, sExtraNameCharacters ) )
                 ||  ( !sName.isEmpty() && !::dbtools::isValidSQLName( sName, sExtraNameCharacters ) )
@@ -157,7 +157,7 @@ namespace sdbtools
             return true;
         }
 
-        virtual void validateName_throw( const ::rtl::OUString& _rName )
+        virtual void validateName_throw( const OUString& _rName )
         {
             if ( validateName( _rName ) )
                 return;
@@ -182,7 +182,7 @@ namespace sdbtools
         {
         }
 
-        inline ::connectivity::ErrorCondition validateName_getErrorCondition( const ::rtl::OUString& _rName )
+        inline ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName )
         {
             if  (   ( _rName.indexOf( (sal_Unicode)34  ) >= 0 )  // "
                 ||  ( _rName.indexOf( (sal_Unicode)39  ) >= 0 )  // '
@@ -199,14 +199,14 @@ namespace sdbtools
             return 0;
         }
 
-        virtual bool validateName( const ::rtl::OUString& _rName )
+        virtual bool validateName( const OUString& _rName )
         {
             if ( validateName_getErrorCondition( _rName ) != 0 )
                 return false;
             return true;
         }
 
-        virtual void validateName_throw( const ::rtl::OUString& _rName )
+        virtual void validateName_throw( const OUString& _rName )
         {
             ::connectivity::ErrorCondition nErrorCondition = validateName_getErrorCondition( _rName );
             if ( nErrorCondition != 0 )
@@ -235,12 +235,12 @@ namespace sdbtools
         }
 
         // INameValidation
-        virtual bool validateName( const ::rtl::OUString& _rName )
+        virtual bool validateName( const OUString& _rName )
         {
             return m_pPrimary->validateName( _rName ) && m_pSecondary->validateName( _rName );
         }
 
-        virtual void validateName_throw( const ::rtl::OUString& _rName )
+        virtual void validateName_throw( const OUString& _rName )
         {
             m_pPrimary->validateName_throw( _rName );
             m_pSecondary->validateName_throw( _rName );
@@ -369,7 +369,7 @@ namespace sdbtools
         catch( const Exception& )
         {
             throw IllegalArgumentException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The connection could not provide its database's meta data." ) ),
+                OUString( "The connection could not provide its database's meta data." ),
                 NULL,
                 0
             );
@@ -407,7 +407,7 @@ namespace sdbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 _CommandType, const ::rtl::OUString& _BaseName ) throw (IllegalArgumentException, RuntimeException)
+    OUString SAL_CALL ObjectNames::suggestName( ::sal_Int32 _CommandType, const OUString& _BaseName ) throw (IllegalArgumentException, RuntimeException)
     {
         EntryGuard aGuard( *this );
 
@@ -422,11 +422,11 @@ namespace sdbtools
                 sBaseName = String( SdbtRes( STR_BASENAME_QUERY ) );
         }
 
-        ::rtl::OUString sName( sBaseName );
+        OUString sName( sBaseName );
         sal_Int32 i = 1;
         while ( !pNameCheck->validateName( sName ) )
         {
-            ::rtl::OUStringBuffer aNameBuffer;
+            OUStringBuffer aNameBuffer;
             aNameBuffer.append( sBaseName );
             aNameBuffer.appendAscii( " " );
             aNameBuffer.append( (sal_Int32)++i );
@@ -437,7 +437,7 @@ namespace sdbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ObjectNames::convertToSQLName( const ::rtl::OUString& Name ) throw (RuntimeException)
+    OUString SAL_CALL ObjectNames::convertToSQLName( const OUString& Name ) throw (RuntimeException)
     {
         EntryGuard aGuard( *this );
         Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW );
@@ -445,7 +445,7 @@ namespace sdbtools
     }
 
     //--------------------------------------------------------------------
-    ::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
+    ::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
     {
         EntryGuard aGuard( *this );
 
@@ -454,7 +454,7 @@ namespace sdbtools
     }
 
     //--------------------------------------------------------------------
-    ::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
+    ::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
     {
         EntryGuard aGuard( *this );
 
@@ -463,7 +463,7 @@ namespace sdbtools
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (SQLException, RuntimeException)
+    void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const OUString& _Name ) throw (SQLException, RuntimeException)
     {
         EntryGuard aGuard( *this );
 
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index c21c1616373f..ef62c6ad5165 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -984,8 +984,8 @@ namespace
         Reference< XInteractionHandler > xHandler( aArgs.getOrDefault( "InteractionHandler", Reference< XInteractionHandler >() ) );
         if ( xHandler.is() )
         {
-            ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rException ) );
-            ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
+            Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rException ) );
+            Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove );
             pRequest->addContinuation( pApprove.get() );
 
             try
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 901453269243..6bc76402e3bf 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -125,7 +125,7 @@ public:
 
 };
 // -----------------------------------------------------------------------------
-void OApplicationController::convertToView(const ::rtl::OUString& _sName)
+void OApplicationController::convertToView(const OUString& _sName)
 {
     try
     {
@@ -147,14 +147,14 @@ void OApplicationController::convertToView(const ::rtl::OUString& _sName)
         OSaveAsDlg aDlg( getView(), CommandType::TABLE, getORB(), xConnection, aDefaultName, aNameChecker );
         if ( aDlg.Execute() == RET_OK )
         {
-            ::rtl::OUString sName = aDlg.getName();
-            ::rtl::OUString sCatalog = aDlg.getCatalog();
-            ::rtl::OUString sSchema  = aDlg.getSchema();
-            ::rtl::OUString sNewName(
+            OUString sName = aDlg.getName();
+            OUString sCatalog = aDlg.getCatalog();
+            OUString sSchema  = aDlg.getSchema();
+            OUString sNewName(
                 ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) );
             Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject);
             if ( !xView.is() )
-                throw SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")) ,0,Any());
+                throw SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,OUString("S1000") ,0,Any());
             getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView));
         }
     }
@@ -193,11 +193,11 @@ void OApplicationController::pasteFormat(sal_uInt32 _nFormatId)
 // -----------------------------------------------------------------------------
 void OApplicationController::openDataSourceAdminDialog()
 {
-    openDialog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DatasourceAdministrationDialog" ) ) );
+    openDialog( OUString( "com.sun.star.sdb.DatasourceAdministrationDialog" ) );
 }
 
 // -----------------------------------------------------------------------------
-void OApplicationController::openDialog( const ::rtl::OUString& _sServiceName )
+void OApplicationController::openDialog( const OUString& _sServiceName )
 {
     try
     {
@@ -216,19 +216,19 @@ void OApplicationController::openDialog( const ::rtl::OUString& _sServiceName )
                 xWindow = VCLUnoHelper::GetInterface(getView()->Window::GetParent());
         }
         // the parent window
-        aArgs[nArgPos++] <<= PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")),
+        aArgs[nArgPos++] <<= PropertyValue( OUString("ParentWindow"),
                                     0,
                                     makeAny(xWindow),
                                     PropertyState_DIRECT_VALUE);
 
         // the initial selection
-        ::rtl::OUString sInitialSelection;
+        OUString sInitialSelection;
         if ( getContainer() )
             sInitialSelection = getDatabaseName();
         if ( !sInitialSelection.isEmpty() )
         {
             aArgs[ nArgPos++ ] <<= PropertyValue(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InitialSelection" ) ), 0,
+                OUString( "InitialSelection" ), 0,
                 makeAny( sInitialSelection ), PropertyState_DIRECT_VALUE );
         }
 
@@ -259,7 +259,7 @@ void OApplicationController::openDialog( const ::rtl::OUString& _sServiceName )
 // -----------------------------------------------------------------------------
 void OApplicationController::openTableFilterDialog()
 {
-    openDialog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.TableFilterDialog" ) ) );
+    openDialog( OUString( "com.sun.star.sdb.TableFilterDialog" ) );
 }
 
 // -----------------------------------------------------------------------------
@@ -311,7 +311,7 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
         const ElementType eType = getContainer()->getElementType();
         if ( eType == E_FORM || eType == E_REPORT )
         {
-            ::rtl::OUString sOldName,sNewName;
+            OUString sOldName,sNewName;
             evt.OldValue >>= sOldName;
             evt.NewValue >>= sNewName;
 
@@ -325,7 +325,7 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
                 {
                     Reference<XContent> xContent(xChild->getParent(),UNO_QUERY);
                     if ( xContent.is() )
-                        sOldName = xContent->getIdentifier()->getContentIdentifier() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sOldName;
+                        sOldName = xContent->getIdentifier()->getContentIdentifier() + OUString("/") + sOldName;
                 }
 
                 getContainer()->elementReplaced( eType , sOldName, sNewName );
@@ -397,22 +397,22 @@ void SAL_CALL OApplicationController::connect(  ) throw (SQLException, RuntimeEx
 }
 
 // -----------------------------------------------------------------------------
-beans::Pair< ::sal_Int32, ::rtl::OUString > SAL_CALL OApplicationController::identifySubComponent( const Reference< XComponent >& i_rSubComponent ) throw (IllegalArgumentException, RuntimeException)
+beans::Pair< ::sal_Int32, OUString > SAL_CALL OApplicationController::identifySubComponent( const Reference< XComponent >& i_rSubComponent ) throw (IllegalArgumentException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( getMutex() );
 
     sal_Int32 nType = -1;
-    ::rtl::OUString sName;
+    OUString sName;
 
     if ( !m_pSubComponentManager->lookupSubComponent( i_rSubComponent, sName, nType ) )
-        throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+        throw IllegalArgumentException( OUString(), *this, 1 );
 
     if ( nType == SID_DB_APP_DSRELDESIGN )
         // this is somewhat hacky ... we're expected to return a DatabaseObject value. However, there is no such
         // value for the relation design. /me thinks we should change the API definition here ...
         nType = -1;
 
-    return beans::Pair< ::sal_Int32, ::rtl::OUString >( nType, sName );
+    return beans::Pair< ::sal_Int32, OUString >( nType, sName );
 }
 
 // -----------------------------------------------------------------------------
@@ -445,7 +445,7 @@ namespace
 }
 
 // -----------------------------------------------------------------------------
-void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int32 _nObjectType, const ::boost::optional< ::rtl::OUString >& i_rObjectName )
+void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int32 _nObjectType, const ::boost::optional< OUString >& i_rObjectName )
 {
     // ensure we're connected
     if ( !isConnected() )
@@ -460,7 +460,7 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
         &&  ( _nObjectType != DatabaseObject::FORM )
         &&  ( _nObjectType != DatabaseObject::REPORT )
         )
-        throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+        throw IllegalArgumentException( OUString(), *this, 1 );
 
     if ( !i_rObjectName )
         return;
@@ -470,7 +470,7 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
     if ( !xContainer.is() )
         // all possible reasons for this (e.g. not being connected currently) should
         // have been handled before
-        throw RuntimeException( ::rtl::OUString(), *this );
+        throw RuntimeException( OUString(), *this );
 
     bool bExistentObject = false;
     switch ( _nObjectType )
@@ -494,14 +494,14 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
 
 // -----------------------------------------------------------------------------
 Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_Int32 _ObjectType,
-    const ::rtl::OUString& _ObjectName, ::sal_Bool _ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
+    const OUString& _ObjectName, ::sal_Bool _ForEditing ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
 {
     return loadComponentWithArguments( _ObjectType, _ObjectName, _ForEditing, Sequence< PropertyValue >() );
 }
 
 // -----------------------------------------------------------------------------
 Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 _ObjectType,
-    const ::rtl::OUString& _ObjectName, ::sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
+    const OUString& _ObjectName, ::sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
@@ -531,7 +531,7 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArgu
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
 
-    impl_validateObjectTypeAndName_throw( i_nObjectType, ::boost::optional< ::rtl::OUString >() );
+    impl_validateObjectTypeAndName_throw( i_nObjectType, ::boost::optional< OUString >() );
 
     Reference< XComponent > xComponent( newElement(
         lcl_objectType2ElementType( i_nObjectType ),
@@ -615,9 +615,9 @@ void OApplicationController::askToReconnect()
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString OApplicationController::getDatabaseName() const
+OUString OApplicationController::getDatabaseName() const
 {
-    ::rtl::OUString sDatabaseName;
+    OUString sDatabaseName;
     try
     {
         if ( m_xDataSource.is() )
@@ -633,14 +633,14 @@ void OApplicationController::askToReconnect()
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString OApplicationController::getStrippedDatabaseName() const
+OUString OApplicationController::getStrippedDatabaseName() const
 {
-    ::rtl::OUString sDatabaseName;
+    OUString sDatabaseName;
     return ::dbaui::getStrippedDatabaseName( m_xDataSource, sDatabaseName );
 }
 
 // -----------------------------------------------------------------------------
-void OApplicationController::onDocumentOpened( const ::rtl::OUString& _rName, const sal_Int32 _nType,
+void OApplicationController::onDocumentOpened( const OUString& _rName, const sal_Int32 _nType,
         const ElementOpenMode _eMode, const Reference< XComponent >& _xDocument, const Reference< XComponent >& _rxDefinition )
 {
     if ( !_xDocument.is() )
@@ -695,7 +695,7 @@ sal_Bool OApplicationController::isRenameDeleteAllowed(ElementType _eType,sal_Bo
             bCompareRes = getContainer()->getSelectionCount() == 1;
             if ( bEnabled && bCompareRes && E_TABLE == eType )
             {
-                ::std::vector< ::rtl::OUString> aList;
+                ::std::vector< OUString> aList;
                 getSelectionElementNames(aList);
 
                 try
@@ -722,7 +722,7 @@ void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::fra
 
     if ( _xLayoutManager.is() )
     {
-        static ::rtl::OUString s_sStatusbar(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar"));
+        static OUString s_sStatusbar("private:resource/statusbar/statusbar");
         _xLayoutManager->createElement( s_sStatusbar );
         _xLayoutManager->requestElement( s_sStatusbar );
 
@@ -752,7 +752,7 @@ void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::fra
 // -----------------------------------------------------------------------------
 void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMode)
 {
-    ::std::vector< ::rtl::OUString> aList;
+    ::std::vector< OUString> aList;
     getSelectionElementNames(aList);
     ElementType eType = getContainer()->getElementType();
     ::comphelper::NamedValueCollection aArguments;
@@ -763,16 +763,16 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod
         eOpenMode = E_OPEN_NORMAL;
     }
 
-    ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > > aCompoments;
-    ::std::vector< ::rtl::OUString>::iterator aEnd = aList.end();
-    for (::std::vector< ::rtl::OUString>::iterator aIter = aList.begin(); aIter != aEnd; ++aIter)
+    ::std::vector< ::std::pair< OUString ,Reference< XModel > > > aCompoments;
+    ::std::vector< OUString>::iterator aEnd = aList.end();
+    for (::std::vector< OUString>::iterator aIter = aList.begin(); aIter != aEnd; ++aIter)
     {
         if ( SID_DB_APP_CONVERTTOVIEW == _nId )
             convertToView(*aIter);
         else
         {
             Reference< XModel > xModel( openElementWithArguments( *aIter, eType, eOpenMode, _nId,aArguments ), UNO_QUERY );
-            aCompoments.push_back( ::std::pair< ::rtl::OUString, Reference< XModel > >( *aIter, xModel ) );
+            aCompoments.push_back( ::std::pair< OUString, Reference< XModel > >( *aIter, xModel ) );
         }
     }
 
@@ -780,9 +780,9 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod
     if ( _eOpenMode == E_OPEN_FOR_MAIL )
     {
 
-        ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin();
-        ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end();
-        ::rtl::OUString aDocTypeString;
+        ::std::vector< ::std::pair< OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin();
+        ::std::vector< ::std::pair< OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end();
+        OUString aDocTypeString;
         SfxMailModel aSendMail;
         SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_OK;
         for (; componentIter != componentEnd && SfxMailModel::SEND_MAIL_OK == eResult; ++componentIter)
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 946b2431313a..4f1d87ff9111 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -89,7 +89,7 @@ namespace dbaui
 
 namespace
 {
-    SvTreeListEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvTreeListEntry* _pFirst)
+    SvTreeListEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const OUString& _rName,SvTreeListEntry* _pFirst)
     {
         SvTreeListEntry* pReturn = NULL;
         sal_Int32 nIndex = 0;
@@ -116,10 +116,10 @@ namespace
         }
         return pReturn;
     }
-    SvTreeListEntry* lcl_findEntry(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvTreeListEntry* _pFirst)
+    SvTreeListEntry* lcl_findEntry(DBTreeListBox& rTree,const OUString& _rName,SvTreeListEntry* _pFirst)
     {
         sal_Int32 nIndex = 0;
-        ::rtl::OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
+        OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
         return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL);
     }
     //==================================================================
@@ -320,7 +320,7 @@ void OAppDetailPageHelper::sortUp()
         sort(nPos,SortAscending);
 }
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const
+void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const
 {
     int nPos = getVisibleControlIndex();
     if ( nPos < E_ELEMENT_TYPE_COUNT )
@@ -339,11 +339,11 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< ::rtl::OUStr
             }
             else
             {
-                ::rtl::OUString sName = rTree.GetEntryText(pEntry);
+                OUString sName = rTree.GetEntryText(pEntry);
                 SvTreeListEntry* pParent = rTree.GetParent(pEntry);
                 while(pParent)
                 {
-                    sName = rTree.GetEntryText(pParent) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sName;
+                    sName = rTree.GetEntryText(pParent) + OUString("/") + sName;
                     pParent = rTree.GetParent(pParent);
                 }
                 _rNames.push_back(sName);
@@ -400,11 +400,11 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e
         case E_FORM:
         case E_REPORT:
         {
-            ::rtl::OUString sName = pList->GetEntryText(pEntry);
+            OUString sName = pList->GetEntryText(pEntry);
             SvTreeListEntry* pParent = pList->GetParent(pEntry);
             while ( pParent )
             {
-                ::rtl::OUStringBuffer buffer;
+                OUStringBuffer buffer;
                 buffer.append( pList->GetEntryText( pParent ) );
                 buffer.append( sal_Unicode( '/' ) );
                 buffer.append( sName );
@@ -438,15 +438,15 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e
 }
 
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNames)
+void OAppDetailPageHelper::selectElements(const Sequence< OUString>& _aNames)
 {
     int nPos = getVisibleControlIndex();
     if ( nPos < E_ELEMENT_TYPE_COUNT )
     {
         DBTreeListBox& rTree = *m_pLists[nPos];
         rTree.SelectAll(sal_False);
-        const ::rtl::OUString* pIter = _aNames.getConstArray();
-        const ::rtl::OUString* pEnd  = pIter + _aNames.getLength();
+        const OUString* pIter = _aNames.getConstArray();
+        const OUString* pEnd  = pIter + _aNames.getLength();
         for(;pIter != pEnd;++pIter)
         {
             SvTreeListEntry* pEntry = rTree.GetEntryPosByName(*pIter);
@@ -456,10 +456,10 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa
     }
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) const
+OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) const
 {
     int nPos = getVisibleControlIndex();
-    ::rtl::OUString sComposedName;
+    OUString sComposedName;
 
     if ( nPos >= E_ELEMENT_TYPE_COUNT )
         return sComposedName;
@@ -485,7 +485,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa
         SvTreeListEntry* pParent = rTree.GetParent(pEntry);
         while(pParent)
         {
-            sComposedName = rTree.GetEntryText(pParent) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sComposedName;
+            sComposedName = rTree.GetEntryText(pParent) + OUString("/") + sComposedName;
             pParent = rTree.GetParent(pParent);
         }
     }
@@ -655,7 +655,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
     sal_uInt16 nImageId = 0;
-    rtl::OString sHelpId;
+    OString sHelpId;
     ImageProvider aImageProvider;
     Image aFolderImage;
     switch( _eType )
@@ -748,9 +748,9 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     {
         const sal_Int32 nFolderIndicator = lcl_getFolderIndicatorForType( _eType );
 
-        Sequence< ::rtl::OUString> aSeq = _xContainer->getElementNames();
-        const ::rtl::OUString* pIter = aSeq.getConstArray();
-        const ::rtl::OUString* pEnd  = pIter + aSeq.getLength();
+        Sequence< OUString> aSeq = _xContainer->getElementNames();
+        const OUString* pIter = aSeq.getConstArray();
+        const OUString* pEnd  = pIter + aSeq.getLength();
         for(;pIter != pEnd;++pIter)
         {
             SvTreeListEntry* pEntry = NULL;
@@ -773,7 +773,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     }
 }
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage)
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const OString& _sHelpId, const Image& _rImage)
 {
     DBTreeListBox* pTreeView = new DBTreeListBox(this,
                        WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
@@ -828,13 +828,13 @@ sal_Bool OAppDetailPageHelper::isFilled() const
 }
 // -----------------------------------------------------------------------------
 void OAppDetailPageHelper::elementReplaced(ElementType _eType
-                                                    ,const ::rtl::OUString& _rOldName
-                                                    ,const ::rtl::OUString& _rNewName )
+                                                    ,const OUString& _rOldName
+                                                    ,const OUString& _rNewName )
 {
     DBTreeListBox* pTreeView = getCurrentView();
     if ( pTreeView )
     {
-        ::rtl::OUString sNewName = _rNewName;
+        OUString sNewName = _rNewName;
         SvTreeListEntry* pEntry = NULL;
         switch( _eType )
         {
@@ -861,7 +861,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType
     }
 }
 // -----------------------------------------------------------------------------
-SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject )
+SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject )
 {
     SvTreeListEntry* pRet = NULL;
     DBTreeListBox* pTreeView = m_pLists[_eType];
@@ -879,7 +879,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::r
             Reference<XContent> xContent(xChild->getParent(),UNO_QUERY);
             if ( xContent.is() )
             {
-                ::rtl::OUString sName = xContent->getIdentifier()->getContentIdentifier();
+                OUString sName = xContent->getIdentifier()->getContentIdentifier();
                 pEntry = lcl_findEntry(*pTreeView,sName,pTreeView->First());
             }
         }
@@ -905,7 +905,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::r
     return pRet;
 }
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUString& _rName )
+void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _rName )
 {
     DBTreeListBox* pTreeView = getCurrentView();
     if ( pTreeView )
@@ -1080,9 +1080,9 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
             {
                 com::sun::star::ucb::Command aCommand;
                 if ( m_ePreviewMode == E_DOCUMENT )
-                    aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("preview"));
+                    aCommand.Name = OUString("preview");
                 else
-                    aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getDocumentInfo"));
+                    aCommand.Name = OUString("getDocumentInfo");
 
                 Any aPreview = xContent->execute(aCommand,xContent->createCommandIdentifier(),Reference< XCommandEnvironment >());
                 if ( m_ePreviewMode == E_DOCUMENT )
@@ -1127,8 +1127,8 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
     }
 }
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
-                                        const ::rtl::OUString& _sName,
+void OAppDetailPageHelper::showPreview( const OUString& _sDataSourceName,
+                                        const OUString& _sName,
                                         sal_Bool _bTable)
 {
     if ( isPreviewEnabled() )
@@ -1141,14 +1141,14 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
         {
             try
             {
-                m_xFrame = Reference < XFrame > ( getBorderWin().getView()->getORB()->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")), getBorderWin().getView()->getORB() ), UNO_QUERY );
+                m_xFrame = Reference < XFrame > ( getBorderWin().getView()->getORB()->getServiceManager()->createInstanceWithContext( OUString("com.sun.star.frame.Frame"), getBorderWin().getView()->getORB() ), UNO_QUERY );
                 m_xFrame->initialize( m_xWindow );
 
                 // no layout manager (and thus no toolbars) in the preview
                 // Must be called after initialize ... but before any other call to this frame.
                 // Otherwise frame throws "life time exceptions" as e.g. NON_INITIALIZED
                 Reference< XPropertySet > xFrameProps( m_xFrame, UNO_QUERY_THROW );
-                xFrameProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ), makeAny(Reference< XLayoutManager >()) );
+                xFrameProps->setPropertyValue( OUString( "LayoutManager" ), makeAny(Reference< XLayoutManager >()) );
 
                 Reference<XFramesSupplier> xSup(getBorderWin().getView()->getAppController().getXController()->getFrame(),UNO_QUERY);
                 if ( xSup.is() )
@@ -1175,7 +1175,7 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
         aArgs.put( "Preview", sal_True );
         aArgs.put( "ReadOnly", sal_True );
         aArgs.put( "AsTemplate", sal_False );
-        aArgs.put( (::rtl::OUString)PROPERTY_SHOWMENU, sal_False );
+        aArgs.put( (OUString)PROPERTY_SHOWMENU, sal_False );
 
         Reference< XController > xPreview( pDispatcher->openExisting( makeAny( _sDataSourceName ), _sName, aArgs ), UNO_QUERY );
         sal_Bool bClearPreview = !xPreview.is();
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index d33d0e75066e..cddaf100fed2 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -64,7 +64,7 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
 // -----------------------------------------------------------------------------
 TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled )
-    :sUNOCommand( ::rtl::OUString::createFromAscii( _pAsciiUNOCommand ) )
+    :sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) )
     ,nHelpID( _nHelpID )
     ,sTitle( ModuleRes( _nTitleResourceID ) )
     ,bHideWhenDisabled( _bHideWhenDisabled )
@@ -480,13 +480,13 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
         Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier =
             ModuleUIConfigurationManagerSupplier::create( getDetailView()->getBorderWin().getView()->getORB() );
         Reference< XUIConfigurationManager > xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OfficeDatabaseDocument" ) )
+            OUString( "com.sun.star.sdb.OfficeDatabaseDocument" )
         );
         Reference< XImageManager > xImageMgr( xUIConfigMgr->getImageManager(), UNO_QUERY );
 
         // copy the commands so we can use them with the config managers
-        Sequence< ::rtl::OUString > aCommands( _rList.size() );
-        ::rtl::OUString* pCommands = aCommands.getArray();
+        Sequence< OUString > aCommands( _rList.size() );
+        OUString* pCommands = aCommands.getArray();
         TaskEntryList::const_iterator aEnd = _rList.end();
         for ( TaskEntryList::const_iterator pCopyTask = _rList.begin(); pCopyTask != aEnd; ++pCopyTask, ++pCommands )
             *pCommands = pCopyTask->sUNOCommand;
@@ -766,7 +766,7 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const
+OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
     return m_pControlHelper->getQualifiedName( _pEntry );
@@ -835,7 +835,7 @@ sal_Int32 OApplicationDetailView::getElementCount()
 }
 
 // -----------------------------------------------------------------------------
-void OApplicationDetailView::getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const
+void OApplicationDetailView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
     m_pControlHelper->getSelectionElementNames( _rNames );
@@ -853,7 +853,7 @@ void OApplicationDetailView::describeCurrentSelectionForType( const ElementType
     m_pControlHelper->describeCurrentSelectionForType( _eType, _out_rSelectedObjects );
 }
 // -----------------------------------------------------------------------------
-void OApplicationDetailView::selectElements(const Sequence< ::rtl::OUString>& _aNames)
+void OApplicationDetailView::selectElements(const Sequence< OUString>& _aNames)
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
     m_pControlHelper->selectElements( _aNames );
@@ -884,21 +884,21 @@ void OApplicationDetailView::paste()
     m_pControlHelper->paste();
 }
 // -----------------------------------------------------------------------------
-SvTreeListEntry*  OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject )
+SvTreeListEntry*  OApplicationDetailView::elementAdded(ElementType _eType,const OUString& _rName, const Any& _rObject )
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
     return m_pControlHelper->elementAdded(_eType,_rName, _rObject );
 }
 // -----------------------------------------------------------------------------
-void OApplicationDetailView::elementRemoved(ElementType _eType,const ::rtl::OUString& _rName )
+void OApplicationDetailView::elementRemoved(ElementType _eType,const OUString& _rName )
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
     m_pControlHelper->elementRemoved(_eType,_rName );
 }
 // -----------------------------------------------------------------------------
 void OApplicationDetailView::elementReplaced(ElementType _eType
-                                                    ,const ::rtl::OUString& _rOldName
-                                                    ,const ::rtl::OUString& _rNewName )
+                                                    ,const OUString& _rOldName
+                                                    ,const OUString& _rNewName )
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
     m_pControlHelper->elementReplaced( _eType, _rOldName, _rNewName );
@@ -928,8 +928,8 @@ void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent)
     m_pControlHelper->showPreview(_xContent);
 }
 // -----------------------------------------------------------------------------
-void OApplicationDetailView::showPreview(   const ::rtl::OUString& _sDataSourceName,
-                                            const ::rtl::OUString& _sName,
+void OApplicationDetailView::showPreview(   const OUString& _sDataSourceName,
+                                            const OUString& _sName,
                                             sal_Bool _bTable)
 {
     DBG_CHKTHIS(OApplicationDetailView,NULL);
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index c32cb38cbd88..803a4b5548be 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -81,7 +81,7 @@ namespace dbaui
         struct SubComponentDescriptor
         {
             /// the name of the sub component, empty if it is yet unsaved
-            ::rtl::OUString sName;
+            OUString sName;
             /// type of the component - an ElementType value, except for relation design
             sal_Int32       nComponentType;
             /// the mode in which the sub component has been opened
@@ -107,7 +107,7 @@ namespace dbaui
             {
             }
 
-            SubComponentDescriptor( const ::rtl::OUString& i_rName, const sal_Int32 i_nComponentType,
+            SubComponentDescriptor( const OUString& i_rName, const sal_Int32 i_nComponentType,
                     const ElementOpenMode i_eOpenMode, const Reference< XComponent >& i_rComponent )
                 :sName( i_rName )
                 ,nComponentType( i_nComponentType )
@@ -120,7 +120,7 @@ namespace dbaui
                     Reference< XComponentSupplier > xCompSupp( i_rComponent, UNO_QUERY_THROW );
                     Reference< XComponent > xComponent( xCompSupp->getComponent(), UNO_QUERY_THROW );
                     if ( !impl_constructFrom( xComponent ) )
-                        throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal component type." ) ), NULL );
+                        throw RuntimeException( OUString( "Illegal component type." ), NULL );
                     xComponentCommandProcessor.set( i_rComponent, UNO_QUERY_THROW );
                     xDocumentDefinitionProperties.set( i_rComponent, UNO_QUERY_THROW );
                 }
@@ -185,7 +185,7 @@ namespace dbaui
         struct SubComponentMatch : public ::std::unary_function< SubComponentDescriptor, bool >
         {
         public:
-            SubComponentMatch( const ::rtl::OUString& i_rName, const sal_Int32 i_nComponentType,
+            SubComponentMatch( const OUString& i_rName, const sal_Int32 i_nComponentType,
                     const ElementOpenMode i_eOpenMode )
                 :m_sName( i_rName )
                 ,m_nComponentType( i_nComponentType )
@@ -200,7 +200,7 @@ namespace dbaui
                     &&  (   m_eOpenMode         ==  i_rCompareWith.eOpenMode      );
             }
         private:
-            const ::rtl::OUString   m_sName;
+            const OUString   m_sName;
             const sal_Int32         m_nComponentType;
             const ElementOpenMode   m_eOpenMode;
         };
@@ -296,7 +296,7 @@ namespace dbaui
                 sal_Int32 nCommandIdentifier = xCommandProcessor->createCommandIdentifier();
 
                 Command aCommand;
-                aCommand.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "close" ) );
+                aCommand.Name = OUString( "close" );
                 xCommandProcessor->execute( aCommand, nCommandIdentifier, NULL );
                 bSuccess = true;
             }
@@ -343,7 +343,7 @@ namespace dbaui
             {
                 Reference< XDocumentEventBroadcaster > xBroadcaster( _rData.m_rController.getModel(), UNO_QUERY_THROW );
                 xBroadcaster->notifyDocumentEvent(
-                    ::rtl::OUString::createFromAscii( _pAsciiEventName ),
+                    OUString::createFromAscii( _pAsciiEventName ),
                     &_rData.m_rController,
                     makeAny( _rComponent.xFrame )
                 );
@@ -371,12 +371,12 @@ namespace dbaui
             if ( comp->xDocumentDefinitionProperties != i_rEvent.Source )
                 continue;
 
-            ::rtl::OUString sNewName;
+            OUString sNewName;
             OSL_VERIFY( i_rEvent.NewValue >>= sNewName );
 
         #if OSL_DEBUG_LEVEL > 0
-            ::rtl::OUString sOldKnownName( comp->sName );
-            ::rtl::OUString sOldName;
+            OUString sOldKnownName( comp->sName );
+            OUString sOldName;
             OSL_VERIFY( i_rEvent.OldValue >>= sOldName );
             OSL_ENSURE( sOldName == sOldKnownName, "SubComponentManager::propertyChange: inconsistency in the old names!" );
         #endif
@@ -483,7 +483,7 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    void SubComponentManager::onSubComponentOpened( const ::rtl::OUString&  _rName, const sal_Int32 _nComponentType,
+    void SubComponentManager::onSubComponentOpened( const OUString&  _rName, const sal_Int32 _nComponentType,
         const ElementOpenMode _eOpenMode, const Reference< XComponent >& _rxComponent )
     {
         ::osl::ClearableMutexGuard aGuard( m_pData->getMutex() );
@@ -519,7 +519,7 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    bool SubComponentManager::activateSubFrame( const ::rtl::OUString& _rName, const sal_Int32 _nComponentType,
+    bool SubComponentManager::activateSubFrame( const OUString& _rName, const sal_Int32 _nComponentType,
         const ElementOpenMode _eOpenMode, Reference< XComponent >& o_rComponent ) const
     {
         ::osl::MutexGuard aGuard( m_pData->getMutex() );
@@ -548,7 +548,7 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    bool SubComponentManager::closeSubFrames( const ::rtl::OUString& i_rName, const sal_Int32 _nComponentType )
+    bool SubComponentManager::closeSubFrames( const OUString& i_rName, const sal_Int32 _nComponentType )
     {
         ::osl::MutexGuard aGuard( m_pData->getMutex() );
         ENSURE_OR_RETURN_FALSE( !i_rName.isEmpty(), "SubComponentManager::closeSubFrames: illegal name!" );
@@ -571,7 +571,7 @@ namespace dbaui
 
     //------------------------------------------------------------------------------------------------------------------
     bool SubComponentManager::lookupSubComponent( const Reference< XComponent >& i_rComponent,
-            ::rtl::OUString& o_rName, sal_Int32& o_rComponentType )
+            OUString& o_rName, sal_Int32& o_rComponentType )
     {
         for (   SubComponents::const_iterator comp = m_pData->m_aComponents.begin();
                 comp != m_pData->m_aComponents.end();