[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/filter/oox/sheetdatabuffer.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d4dad2989071eb5a21d608aa5c3782a68fddf571
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Sep 30 20:31:34 2017 +0200

    Resolves: tdf#100822 use sax::Converter::parseDateTime() for 'd' ISO 8601 date
    
    Instead of squeezing the string through the locale dependent
    number parser (which should force '.' Time100SecSeparator for 'T'
    ISO 8601 but apparently doesn't yet) that is a bottle neck anyway.
    
    Change-Id: I70f74e680322a715c9cc658c8be033620d9798e3
    (cherry picked from commit 5374c04a89e1720490a3625dfd95406c2d60c0cd)
    Reviewed-on: https://gerrit.libreoffice.org/42971
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 44a0e02fdeb3..f4a6d3cb704a 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -54,6 +54,7 @@
 #include "documentimport.hxx"
 #include "formulabuffer.hxx"
 #include <numformat.hxx>
+#include <sax/tools/converter.hxx>
 
 namespace oox {
 namespace xls {
@@ -215,15 +216,17 @@ void SheetDataBuffer::setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCod
 
 void SheetDataBuffer::setDateCell( const CellModel& rModel, const OUString& rDateString )
 {
-    ScDocument& rDoc = getScDocument();
-    SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
-
-    double fValue = 0.0;
-    sal_uInt32 nFormatIndex = 0;
-    bool bValid = pFormatter->IsNumberFormat( rDateString, nFormatIndex, fValue );
+    css::util::DateTime aDateTime;
+    if (!sax::Converter::parseDateTime( aDateTime, nullptr, rDateString))
+    {
+        SAL_WARN("sc.filter", "SheetDataBuffer::setDateCell - could not parse: " << rDateString);
+        // At least don't lose data.
+        setStringCell( rModel, rDateString);
+        return;
+    }
 
-    if(bValid)
-        setValueCell( rModel, fValue );
+    double fSerial = getUnitConverter().calcSerialFromDateTime( aDateTime);
+    setValueCell( rModel, fSerial);
 }
 
 void SheetDataBuffer::createSharedFormula(const ScAddress& rAddr, const ApiTokenSequence& rTokens)