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>

4 files changed, 162 insertions, 196 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() )
         {