fdo#38838, String to OUString in dbaccess/source/ext/macromigration

String to OUString applied in dbaccess/source/ext/macromigration module.
Also, RTL_CONSTASCII_USTRINGPARAM is removed from files, plus
::rtl::OUString replaced by OUString.

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

14 files changed, 76 insertions, 76 deletions

diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index 22f3eacdf8c3..e275de6e1552 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -32,7 +32,7 @@ namespace dbmm
     //= helper
     //====================================================================
     //--------------------------------------------------------------------
-    String getScriptTypeDisplayName( const ScriptType _eType )
+    OUString getScriptTypeDisplayName( const ScriptType _eType )
     {
         sal_uInt16 nResId( 0 );
 
@@ -46,7 +46,7 @@ namespace dbmm
         case eDialog:       nResId = STR_DIALOG;        break;
         }
         OSL_ENSURE( nResId != 0, "getScriptTypeDisplayName: illegal script type!" );
-        return nResId ? String( MacroMigrationResId( nResId ) ) : String();
+        return nResId ? OUString( MacroMigrationResId( nResId ) ) : OUString();
     }
 
 //........................................................................
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx
index 0792ec8e3d2a..a8d0027916f5 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx
@@ -52,7 +52,7 @@ namespace dbmm
     //====================================================================
     //= helper
     //====================================================================
-    String getScriptTypeDisplayName( const ScriptType _eType );
+    OUString getScriptTypeDisplayName( const ScriptType _eType );
 
 //........................................................................
 } // namespace dbmm
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index 9e21ef418541..a83deb852006 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -89,11 +89,11 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    bool InteractionHandler::requestDocumentPassword( const ::rtl::OUString& _rDocumentName, ::rtl::OUString& _io_rPassword )
+    bool InteractionHandler::requestDocumentPassword( const OUString& _rDocumentName, OUString& _io_rPassword )
     {
         // create request
         DocumentPasswordRequest aRequest(
-            ::rtl::OUString(), NULL,
+            OUString(), NULL,
             InteractionClassification_QUERY,
             _io_rPassword.isEmpty() ? PasswordRequestMode_PASSWORD_ENTER : PasswordRequestMode_PASSWORD_REENTER,
             _rDocumentName
diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx
index 502a289cf546..3291bcaeda2d 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.hxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.hxx
@@ -63,8 +63,8 @@ namespace dbmm
                 if the user aborted the request.
         */
         bool    requestDocumentPassword(
-                    const ::rtl::OUString& _rDocumentName,
-                          ::rtl::OUString& _io_rPassword
+                    const OUString& _rDocumentName,
+                          OUString& _io_rPassword
                 );
 
         /** reports the given error (usually an exception caught on the caller's side)
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 84c0ce853af4..0eb2da076992 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -144,10 +144,10 @@ namespace dbmm
         :MacroMigrationDialog_Base( _pParent, MacroMigrationResId( DLG_MACRO_MIGRATION ) )
         ,m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) )
     {
-        String sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS ) );
-        String sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC ) );
-        String sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) );
-        String sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) );
+        OUString sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS ) );
+        OUString sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC ) );
+        OUString sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) );
+        OUString sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) );
         FreeResource();
 
         describeState( STATE_CLOSE_SUB_DOCS,    sTitlePrepare, &PreparationPage::Create   );
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 84302b60ac78..415319af433d 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -153,7 +153,7 @@ namespace dbmm
             INetURLObject aURLParser( xDocument->getURL() );
             OSL_ENSURE( aURLParser.GetProtocol() != INET_PROT_NOT_VALID, "SaveDBDocPage::initializePage: illegal document URL!" );
 
-            ::rtl::OUStringBuffer aBaseName( aURLParser.getBase() );
+            OUStringBuffer aBaseName( aURLParser.getBase() );
             aBaseName.appendAscii( ".backup" );
             aURLParser.setBase( aBaseName.makeStringAndClear() );
 
@@ -225,9 +225,9 @@ namespace dbmm
     //--------------------------------------------------------------------
     void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports )
     {
-        String sText( m_aObjectCount.GetText() );
-        sText.SearchAndReplaceAscii( "$forms$", OUString::number( _nForms ) );
-        sText.SearchAndReplaceAscii( "$reports$", OUString::number( _nReports ) );
+        OUString sText( m_aObjectCount.GetText() );
+        sText = sText.replaceFirst( "$forms$", OUString::number( _nForms ) );
+        sText = sText.replaceFirst( "$reports$", OUString::number( _nReports ) );
         m_aObjectCount.SetText( sText );
     }
 
@@ -238,7 +238,7 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void ProgressPage::startObject( const ::rtl::OUString& _rObjectName, const ::rtl::OUString& _rCurrentAction, const sal_uInt32 _nRange )
+    void ProgressPage::startObject( const OUString& _rObjectName, const OUString& _rCurrentAction, const sal_uInt32 _nRange )
     {
         m_aCurrentObject.SetText( _rObjectName );
         m_aCurrentAction.SetText( _rCurrentAction );
@@ -253,7 +253,7 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void ProgressPage::setObjectProgressText( const ::rtl::OUString& _rText )
+    void ProgressPage::setObjectProgressText( const OUString& _rText )
     {
         m_aCurrentAction.SetText( _rText );
         m_aCurrentAction.Update();
@@ -270,7 +270,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     void ProgressPage::endObject()
     {
-        m_aCurrentAction.SetText( String() );
+        m_aCurrentAction.SetText( OUString() );
         m_aCurrentProgress.SetValue( m_aCurrentProgress.GetRange() );
         m_aCurrentAction.Update();
         Update();
@@ -284,7 +284,7 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void ProgressPage::setOverallProgressText( const ::rtl::OUString& _rText )
+    void ProgressPage::setOverallProgressText( const OUString& _rText )
     {
         m_aAllProgressText.SetText( _rText );
         Update();
@@ -318,7 +318,7 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void ResultPage::displayMigrationLog( const bool _bSuccessful, const String& _rSummary )
+    void ResultPage::displayMigrationLog( const bool _bSuccessful, const OUString& _rSummary )
     {
         m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful );
         m_aChanges.SetText( _rSummary );
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index e3589aab8f42..0bb8c589ae12 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -88,7 +88,7 @@ namespace dbmm
         static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
 
     public:
-        ::rtl::OUString getBackupLocation() const { return m_aLocationController.getURL(); }
+        OUString getBackupLocation() const { return m_aLocationController.getURL(); }
         void            grabLocationFocus() { m_aSaveAsLocation.GrabFocus(); }
 
     protected:
@@ -126,12 +126,12 @@ namespace dbmm
 
     protected:
         // IMigrationProgress
-        virtual void    startObject( const ::rtl::OUString& _rObjectName, const ::rtl::OUString& _rCurrentAction, const sal_uInt32 _bRange );
-        virtual void    setObjectProgressText( const ::rtl::OUString& _rText );
+        virtual void    startObject( const OUString& _rObjectName, const OUString& _rCurrentAction, const sal_uInt32 _bRange );
+        virtual void    setObjectProgressText( const OUString& _rText );
         virtual void    setObjectProgressValue( const sal_uInt32 _nValue );
         virtual void    endObject();
         virtual void    start( const sal_uInt32 _nOverallRange );
-        virtual void    setOverallProgressText( const ::rtl::OUString& _rText );
+        virtual void    setOverallProgressText( const OUString& _rText );
         virtual void    setOverallProgressValue( const sal_uInt32 _nValue );
 
     private:
@@ -157,13 +157,13 @@ namespace dbmm
 
         static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
 
-        void            displayMigrationLog( const bool _bSuccessful, const String& _rLog );
+        void            displayMigrationLog( const bool _bSuccessful, const OUString& _rLog );
 
     private:
         FixedText       m_aChangesLabel;
         MultiLineEdit   m_aChanges;
-        String          m_aSuccessful;
-        String          m_aUnsuccessful;
+        OUString          m_aSuccessful;
+        OUString          m_aUnsuccessful;
     };
 
 //........................................................................
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index b81e1809e06e..5c95ec717b61 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -196,7 +196,7 @@ namespace dbmm
 
         if ( _rArguments.getLength() != 1 )
             throw IllegalArgumentException(
-                String(MacroMigrationResId(STR_INVALID_NUMBER_ARGS)),
+                OUString(MacroMigrationResId(STR_INVALID_NUMBER_ARGS)),
                 *this,
                 1
             );
@@ -204,7 +204,7 @@ namespace dbmm
         m_xDocument.set( _rArguments[0], UNO_QUERY );
         if ( !m_xDocument.is() )
             throw IllegalArgumentException(
-                String(MacroMigrationResId(STR_NO_DATABASE)),
+                OUString(MacroMigrationResId(STR_NO_DATABASE)),
                 *this,
                 1
             );
@@ -212,7 +212,7 @@ namespace dbmm
         Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW );
         if ( xDocStor->isReadonly() )
             throw IllegalArgumentException(
-                String(MacroMigrationResId(STR_NOT_READONLY)),
+                OUString(MacroMigrationResId(STR_NOT_READONLY)),
                 *this,
                 1
             );
diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index 1056c24232bc..0feca29d89b6 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -66,7 +66,7 @@ namespace dbmm
     struct MigrationError
     {
         const MigrationErrorType            eType;
-        ::std::vector< ::rtl::OUString >    aErrorDetails;
+        ::std::vector< OUString >    aErrorDetails;
         const ::com::sun::star::uno::Any    aCaughtException;
 
         MigrationError(
@@ -85,7 +85,7 @@ namespace dbmm
 
         MigrationError(
                 const MigrationErrorType _eType,
-                const ::rtl::OUString& _rDetail )
+                const OUString& _rDetail )
             :eType( _eType )
         {
             impl_constructDetails( _rDetail );
@@ -93,7 +93,7 @@ namespace dbmm
 
         MigrationError(
                 const MigrationErrorType _eType,
-                const ::rtl::OUString& _rDetail,
+                const OUString& _rDetail,
                 const ::com::sun::star::uno::Any& _rCaughtException )
             :eType( _eType )
             ,aCaughtException( _rCaughtException )
@@ -103,8 +103,8 @@ namespace dbmm
 
         MigrationError(
                 const MigrationErrorType _eType,
-                const ::rtl::OUString& _rDetail1,
-                const ::rtl::OUString& _rDetail2 )
+                const OUString& _rDetail1,
+                const OUString& _rDetail2 )
             :eType( _eType )
         {
             impl_constructDetails( _rDetail1, _rDetail2 );
@@ -112,8 +112,8 @@ namespace dbmm
 
         MigrationError(
                 const MigrationErrorType _eType,
-                const ::rtl::OUString& _rDetail1,
-                const ::rtl::OUString& _rDetail2,
+                const OUString& _rDetail1,
+                const OUString& _rDetail2,
                 const ::com::sun::star::uno::Any& _rCaughtException )
             :eType( _eType )
             ,aCaughtException( _rCaughtException )
@@ -123,9 +123,9 @@ namespace dbmm
 
         MigrationError(
                 const MigrationErrorType _eType,
-                const ::rtl::OUString& _rDetail1,
-                const ::rtl::OUString& _rDetail2,
-                const ::rtl::OUString& _rDetail3,
+                const OUString& _rDetail1,
+                const OUString& _rDetail2,
+                const OUString& _rDetail3,
                 const ::com::sun::star::uno::Any& _rCaughtException )
             :eType( _eType )
             ,aCaughtException( _rCaughtException )
@@ -135,9 +135,9 @@ namespace dbmm
 
         MigrationError(
                 const MigrationErrorType _eType,
-                const ::rtl::OUString& _rDetail1,
-                const ::rtl::OUString& _rDetail2,
-                const ::rtl::OUString& _rDetail3 )
+                const OUString& _rDetail1,
+                const OUString& _rDetail2,
+                const OUString& _rDetail3 )
             :eType( _eType )
         {
             impl_constructDetails( _rDetail1, _rDetail2, _rDetail3 );
@@ -145,9 +145,9 @@ namespace dbmm
 
     private:
         void    impl_constructDetails(
-                    const ::rtl::OUString& _rDetail1,
-                    const ::rtl::OUString& _rDetail2 = ::rtl::OUString(),
-                    const ::rtl::OUString& _rDetail3 = ::rtl::OUString()
+                    const OUString& _rDetail1,
+                    const OUString& _rDetail2 = OUString(),
+                    const OUString& _rDetail3 = OUString()
                 )
         {
             if ( !_rDetail1.isEmpty() ) aErrorDetails.push_back( _rDetail1 );
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 647f63388cb8..977547c177ba 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -387,10 +387,10 @@ namespace dbmm
         void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
         {
             _rBuffer.appendAscii( "=== " );
-            _rBuffer.append     ( String( MacroMigrationResId( _nHeadingResId ) ) );
+            _rBuffer.append     ( OUString( MacroMigrationResId( _nHeadingResId ) ) );
             _rBuffer.appendAscii( " ===\n" );
 
-            String sException( MacroMigrationResId( STR_EXCEPTION ) );
+            OUString sException( MacroMigrationResId( STR_EXCEPTION ) );
 
             for (   ErrorLog::const_iterator error = _rErrors.begin();
                     error != _rErrors.end();
@@ -432,11 +432,11 @@ namespace dbmm
 
         if ( !m_pData->sBackupLocation.isEmpty() )
         {
-            String sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
-            sBackedUp.SearchAndReplaceAllAscii( "$location$", m_pData->sBackupLocation );
+            OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
+            sBackedUp.replaceFirst( "$location$", m_pData->sBackupLocation );
 
             aBuffer.appendAscii( "=== " );
-            aBuffer.append     ( String( MacroMigrationResId( STR_DATABASE_DOCUMENT ) ) );
+            aBuffer.append     ( OUString( MacroMigrationResId( STR_DATABASE_DOCUMENT ) ) );
             aBuffer.appendAscii( " ===\n" );
             aBuffer.append     ( sBackedUp );
             aBuffer.appendAscii( "\n\n" );
@@ -449,7 +449,7 @@ namespace dbmm
         }
         else
         {
-            String sMovedLibTemplate( MacroMigrationResId( STR_MOVED_LIBRARY ) );
+            OUString sMovedLibTemplate( MacroMigrationResId( STR_MOVED_LIBRARY ) );
 
             for (   DocumentLogs::const_iterator doc = m_pData->aDocumentLogs.begin();
                     doc != m_pData->aDocumentLogs.end();
@@ -461,8 +461,8 @@ namespace dbmm
                 if ( rDoc.aMovedLibraries.empty() )
                     continue;
 
-                String sDocTitle( MacroMigrationResId( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) );
-                sDocTitle.SearchAndReplaceAllAscii( "$name$", rDoc.sName );
+                OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) );
+                sDocTitle.replaceFirst( "$name$", rDoc.sName );
 
                 aBuffer.appendAscii( "=== " );
                 aBuffer.append     ( sDocTitle );
@@ -473,10 +473,10 @@ namespace dbmm
                         ++lib
                     )
                 {
-                    String sMovedLib( sMovedLibTemplate );
-                    sMovedLib.SearchAndReplaceAllAscii( "$type$", getScriptTypeDisplayName( lib->eType ) );
-                    sMovedLib.SearchAndReplaceAllAscii( "$old$", lib->sOldName );
-                    sMovedLib.SearchAndReplaceAllAscii( "$new$", lib->sNewName );
+                    OUString sMovedLib( sMovedLibTemplate );
+                    sMovedLib.replaceFirst( "$type$", getScriptTypeDisplayName( lib->eType ) );
+                    sMovedLib.replaceFirst( "$old$", lib->sOldName );
+                    sMovedLib.replaceFirst( "$new$", lib->sNewName );
 
                     aBuffer.append( sMovedLib );
                     aBuffer.append( sal_Unicode( '\n' ) );
diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx
index 608f62893cee..5264505ffd1d 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.hxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.hxx
@@ -59,12 +59,12 @@ namespace dbmm
         bool        hadFailure() const;
 
         /// logs the fact that the database document has been backed up
-        void        backedUpDocument( const ::rtl::OUString& _rNewDocumentLocation );
+        void        backedUpDocument( const OUString& _rNewDocumentLocation );
 
         /** logs that the migration for a certain sub document has been started, returns
             a unique ID for this sub document which is to be used in later calls
         */
-        DocumentID  startedDocument( const SubDocumentType _eType, const ::rtl::OUString& _rName );
+        DocumentID  startedDocument( const SubDocumentType _eType, const OUString& _rName );
 
         /** logs the event that a macro or script library has been moved from within a
             sub document to the database document
@@ -72,8 +72,8 @@ namespace dbmm
         void        movedLibrary(
                         const DocumentID _nDocID,
                         const ScriptType _eScriptType,
-                        const ::rtl::OUString& _rOriginalLibName,
-                        const ::rtl::OUString& _rNewLibName
+                        const OUString& _rOriginalLibName,
+                        const OUString& _rNewLibName
                     );
 
         /** logs that the migration for a certain document has been finished
@@ -89,11 +89,11 @@ namespace dbmm
             <member>movedLibrary</member>. If not, an assertion will be raised in
             the non-product builds, and an empty string will be returned.
         */
-        const ::rtl::OUString&
+        const OUString&
                     getNewLibraryName(
                         DocumentID _nDocID,
                         ScriptType _eScriptType,
-                        const ::rtl::OUString& _rOriginalLibName
+                        const OUString& _rOriginalLibName
                     ) const;
 
         /** determines whether for the given document, any library needed to be (and was) moved
@@ -103,7 +103,7 @@ namespace dbmm
         /** provides a human-readable version of the log, explaining a user what happened during
             the migration.
         */
-        ::rtl::OUString
+        OUString
                     getCompleteLog() const;
 
     private:
diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx
index f30f0be53c3e..bf9943c7538a 100644
--- a/dbaccess/source/ext/macromigration/migrationprogress.hxx
+++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx
@@ -31,12 +31,12 @@ namespace dbmm
     class SAL_NO_VTABLE IMigrationProgress
     {
     public:
-        virtual void    startObject( const ::rtl::OUString& _rObjectName, const ::rtl::OUString& _rCurrentAction, const sal_uInt32 _nRange ) = 0;
-        virtual void    setObjectProgressText( const ::rtl::OUString& _rText ) = 0;
+        virtual void    startObject( const OUString& _rObjectName, const OUString& _rCurrentAction, const sal_uInt32 _nRange ) = 0;
+        virtual void    setObjectProgressText( const OUString& _rText ) = 0;
         virtual void    setObjectProgressValue( const sal_uInt32 _nValue ) = 0;
         virtual void    endObject() = 0;
         virtual void    start( const sal_uInt32 _nOverallRange ) = 0;
-        virtual void    setOverallProgressText( const ::rtl::OUString& _rText ) = 0;
+        virtual void    setOverallProgressText( const OUString& _rText ) = 0;
         virtual void    setOverallProgressValue( const sal_uInt32 _nValue ) = 0;
 
     protected:
diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index e9a6a853feff..371e99cc31ff 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -45,14 +45,14 @@ namespace dbmm
     //====================================================================
     struct ProgressCapture_Data
     {
-        ProgressCapture_Data( const ::rtl::OUString& _rObjectName, IMigrationProgress& _rMasterProgress )
+        ProgressCapture_Data( const OUString& _rObjectName, IMigrationProgress& _rMasterProgress )
             :sObjectName( _rObjectName )
             ,rMasterProgress( _rMasterProgress )
             ,bDisposed( false )
         {
         }
 
-        ::rtl::OUString     sObjectName;
+        OUString     sObjectName;
         IMigrationProgress& rMasterProgress;
         bool                bDisposed;
     };
@@ -61,7 +61,7 @@ namespace dbmm
     //= ProgressCapture
     //====================================================================
     //--------------------------------------------------------------------
-    ProgressCapture::ProgressCapture( const ::rtl::OUString& _rObjectName, IMigrationProgress& _rMasterProgress )
+    ProgressCapture::ProgressCapture( const OUString& _rObjectName, IMigrationProgress& _rMasterProgress )
         :m_pData( new ProgressCapture_Data( _rObjectName, _rMasterProgress ) )
     {
     }
@@ -79,7 +79,7 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL ProgressCapture::start( const ::rtl::OUString& _rText, ::sal_Int32 _nRange ) throw (RuntimeException)
+    void SAL_CALL ProgressCapture::start( const OUString& _rText, ::sal_Int32 _nRange ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
         if ( !m_pData->bDisposed )
@@ -95,7 +95,7 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL ProgressCapture::setText( const ::rtl::OUString& _rText ) throw (RuntimeException)
+    void SAL_CALL ProgressCapture::setText( const OUString& _rText ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
         if ( !m_pData->bDisposed )
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx
index a606f32bbe53..c3a5b3a1b29a 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -44,14 +44,14 @@ namespace dbmm
     class ProgressCapture : public ProgressCapture_Base
     {
     public:
-        ProgressCapture( const ::rtl::OUString& _rObjectName, IMigrationProgress& _rMasterProgress );
+        ProgressCapture( const OUString& _rObjectName, IMigrationProgress& _rMasterProgress );
 
         void    dispose();
 
         // XStatusIndicator
-        virtual void SAL_CALL start( const ::rtl::OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL start( const OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL end(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setText( const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setText( const OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setValue( ::sal_Int32 Value ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL reset(  ) throw (::com::sun::star::uno::RuntimeException);