[Libreoffice-commits] core.git: dbaccess/source

[Tor Lillqvist]

 dbaccess/source/ext/macromigration/migrationlog.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 24bd259451fae36c993977f52d62365fa63ac87c
Author: Tor Lillqvist <t...@iki.fi>
Date:   Tue Feb 26 15:42:15 2013 +0200

    String::SearchAndReplaceAllAscii() corresponds to OUString::replaceAll()
    
    The code originally used the former methods, so now when it has been
    changed to use OUStrings instead, it should use the latter. (I don't
    know if it is significant in the presumably quite specific use cases
    here.)
    
    Change-Id: I83cc7c602f376784054f479668171ccfa7f478f7

diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx 
b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 229ee2f..4a8c631 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -433,7 +433,7 @@ namespace dbmm
         if ( !m_pData->sBackupLocation.isEmpty() )
         {
             OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) );
-            sBackedUp = sBackedUp.replaceFirst( "$location$", 
m_pData->sBackupLocation );
+            sBackedUp = sBackedUp.replaceAll( "$location$", 
m_pData->sBackupLocation );
 
             aBuffer.appendAscii( "=== " );
             aBuffer.append     ( OUString( MacroMigrationResId( 
STR_DATABASE_DOCUMENT ) ) );
@@ -462,7 +462,7 @@ namespace dbmm
                     continue;
 
                 OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ? 
STR_FORM : STR_REPORT ) );
-                sDocTitle = sDocTitle.replaceFirst( "$name$", rDoc.sName );
+                sDocTitle = sDocTitle.replaceAll( "$name$", rDoc.sName );
 
                 aBuffer.appendAscii( "=== " );
                 aBuffer.append     ( sDocTitle );
@@ -474,9 +474,9 @@ namespace dbmm
                     )
                 {
                     OUString sMovedLib( sMovedLibTemplate );
-                    sMovedLib = sMovedLib.replaceFirst( "$type$", 
getScriptTypeDisplayName( lib->eType ) );
-                    sMovedLib = sMovedLib.replaceFirst( "$old$", lib->sOldName 
);
-                    sMovedLib = sMovedLib.replaceFirst( "$new$", lib->sNewName 
);
+                    sMovedLib = sMovedLib.replaceAll( "$type$", 
getScriptTypeDisplayName( lib->eType ) );
+                    sMovedLib = sMovedLib.replaceAll( "$old$", lib->sOldName );
+                    sMovedLib = sMovedLib.replaceAll( "$new$", lib->sNewName );
 
                     aBuffer.append( sMovedLib );
                     aBuffer.append( sal_Unicode( '\n' ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits