[PATCH libreoffice-4-0] Revert "svformatter already accept OUString input", fdo#6330...

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3468

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/3468/1

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)
---
M basic/source/runtime/runtime.cxx
1 file changed, 5 insertions(+), 3 deletions(-)



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 @@
     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 );
 }
 

-- 
To view, visit https://gerrit.libreoffice.org/3468
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd7c1e1e57162eefb1f3631aa5509fd3a09c9b08
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke <erack at redhat.com>