[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basic/source

[Eike Rathke]

 basic/source/runtime/runtime.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f2fcd0aac530f0ff217304e1869f33d620087dff
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 18 22:53:00 2013 +0200

    Revert "svformatter already accept OUString input", fdo#63306
    
    This reverts commit c5e5699c80cfb32a164696a2c5144b5ccb0a91a9.
    
    And adapts to OUString.
    
    Conflicts:
    	basic/source/runtime/runtime.cxx
    
    Change-Id: Icd7c1e1e57162eefb1f3631aa5509fd3a09c9b08
    (cherry picked from commit 1ef2cce787df3d254a78ebdb469fb06668f350f4)
    Reviewed-on: https://gerrit.libreoffice.org/3468
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 1223577..ed1e5d1 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -392,12 +392,14 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
     case YMD: aDateStr = "JJJJ.MM.TT"; break;
     default:  aDateStr = "MM.TT.JJJJ"; break;
     }
-    rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType,
-                                           rnStdDateIdx, LANGUAGE_GERMAN, eLangType );
+    OUString aStr( aDateStr );      // PutandConvertEntry() modifies string!
+    rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
+        rnStdDateIdx, LANGUAGE_GERMAN, eLangType );
     nCheckPos = 0;
     OUString aStrHHMMSS(" HH:MM:SS");
     aDateStr += aStrHHMMSS;
-    rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType,
+    aStr = aDateStr;
+    rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
         rnStdDateTimeIdx, LANGUAGE_GERMAN, eLangType );
 }