Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


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@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.