summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorDaniel Bankston <daniel.e.bankston@gmail.com>2012-07-11 16:49:19 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-07-11 20:37:44 -0400
commit4e5c55afee36d02bdfe4c0fb09e3b42e9eadb6c5 (patch)
tree674547e7e1f583f5294a78594a8eb613f95e4dc7 /sc
parentc3452373b90bc952f32db8a08413c87958b0f2df (diff)
Distinguish between DATE and DATETIME formats in ODS import
Change-Id: Ia727e48582a87efc8a8e632108f5949ac36bf49c
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx1
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx3
2 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index e3ab4167e652..58581385599e 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 c3e3cd7c7b15..831176ca37f6 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1979,7 +1979,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 }