[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/source

[Daniel Bankston]

 sc/source/filter/xml/xmlcelli.cxx |    1 +
 sc/source/filter/xml/xmlimprt.cxx |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 243c7d512c49ca2d5d561ac9ebb2d6754027743e
Author: Daniel Bankston <daniel.e.bankston at gmail.com>
Date:   Wed Jul 11 16:49:19 2012 -0500

    Distinguish between DATE and DATETIME formats in ODS import
    
    Change-Id: Ia727e48582a87efc8a8e632108f5949ac36bf49c

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 53adbc2..1662e05 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -871,6 +871,7 @@ void ScXMLTableRowCellContext::AddCellsToTable( const ScAddress& rCellPos,
                             case util::NumberFormat::PERCENT:
                             case util::NumberFormat::CURRENCY:
                             case util::NumberFormat::TIME:
+                            case util::NumberFormat::DATE:
                             case util::NumberFormat::DATETIME:
                             case util::NumberFormat::LOGICAL:
                             {
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index ccce62e..ba43857 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1978,7 +1978,8 @@ ScXMLImport::ScXMLImport(
         { XML_FLOAT,        util::NumberFormat::NUMBER },
         { XML_STRING,       util::NumberFormat::TEXT },
         { XML_TIME,         util::NumberFormat::TIME },
-        { XML_DATE,         util::NumberFormat::DATETIME },
+        { XML_DATE,         util::NumberFormat::DATE },
+        { XML_DATE_TIME,    util::NumberFormat::DATETIME },
         { XML_PERCENTAGE,   util::NumberFormat::PERCENT },
         { XML_CURRENCY,     util::NumberFormat::CURRENCY },
         { XML_BOOLEAN,      util::NumberFormat::LOGICAL }