[Libreoffice-commits] .: 2 commits - cli_ure/source forms/source

[Libreoffice Gerrit user]

 cli_ure/source/climaker/climaker_emit.cxx |    2 +-
 forms/source/xforms/resourcehelper.cxx    |    8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 1ba8986446dbaa77c9aed6d141ee99da74bf1afb
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jan 30 15:12:34 2013 +0100

    fix for the awkward OUString::replaceAll() behaviour
    
    Change-Id: I6ee919bb17ea7eb29cb9cfc0fc69d02d728d9a0f

diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx
index a39f767..50cd74f 100644
--- a/forms/source/xforms/resourcehelper.cxx
+++ b/forms/source/xforms/resourcehelper.cxx
@@ -55,12 +55,10 @@ OUString getResource( sal_uInt16 nResourceId,
     OUString sResource = frm::ResourceManager::loadString( nResourceId );
     OSL_ENSURE( !sResource.isEmpty(), "resource not found?" );
 
-    // use old style String class for search and replace, so we don't have to
-    // code this again.
     OUString sString( sResource );
-    sString.replaceAll( "$1", rInfo1 );
-    sString.replaceAll( "$2", rInfo2 );
-    sString.replaceAll( "$3", rInfo3 );
+    sString = sString.replaceAll( "$1", rInfo1 );
+    sString = sString.replaceAll( "$2", rInfo2 );
+    sString = sString.replaceAll( "$3", rInfo3 );
     return sString;
 }
 
commit ce22d30eeb6fcd3dfcf3fe3c67adeaddb0d97017
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jan 30 15:09:48 2013 +0100

    do not try to concatenate two string literals using +
    
    Change-Id: I7f06a9b065d5dd24da48e06792cacd27d157a656

diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index cb4e427..fcefc26 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -1140,7 +1140,7 @@ Assembly ^ TypeEmitter::type_resolve(
         const OUString sType(entry->m_xType->getName());
         const OUString sMemberName(pseq_member_names[i]);
         if ( ! pseq_members[i].is())
-            throw RuntimeException("Missing type description . Check if you need to " +
+            throw RuntimeException("Missing type description . Check if you need to "
             "specify additional RDBs with the --extra option. Type missing for: " +  sType +
             "::" + sMemberName,0);
     }