diff options
| author | Daniel Vogelheim <dvo@openoffice.org> | 2002-01-11 15:42:22 +0000 |
|---|---|---|
| committer | Daniel Vogelheim <dvo@openoffice.org> | 2002-01-11 15:42:22 +0000 |
| commit | e57dc7c4040058c3a6fd6db5e1999231781a72ef (patch) | |
| tree | 5d49a31f0e8fa4a07450cbe609fd0057b1da0197 | |
| parent | 2ee99e91a31335efaceb969ae5fa4a6a43f35e21 (diff) | |
#96457# #i2723# load/save date+time in date fields (used to be only date)
| -rw-r--r-- | xmloff/source/text/txtflde.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/text/txtfldi.cxx | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 730c16b53308..1146f58a3bdf 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtflde.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: jp $ $Date: 2001-11-30 11:48:11 $ + * last change: $Author: dvo $ $Date: 2002-01-11 16:42:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1299,14 +1299,16 @@ void XMLTextFieldExport::ExportFieldHelper( ProcessDateTime(XML_DATE_VALUE, GetDateTimeProperty(sPropertyDateTimeValue, rPropSet), - sal_True); + // #96457#: date fields should also save time + sal_False); } // TODO: remove double-handling after SRC614 else if (xPropSetInfo->hasPropertyByName(sPropertyDateTime)) { ProcessDateTime(XML_DATE_VALUE, GetDateTimeProperty(sPropertyDateTime,rPropSet), - sal_True ); + // #96457#: date fields should also save time + sal_False); } if (xPropSetInfo->hasPropertyByName(sPropertyIsFixed)) { diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 72480ca37505..19b635ee3ab0 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfldi.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: dvo $ $Date: 2001-10-25 12:37:12 $ + * last change: $Author: dvo $ $Date: 2002-01-11 16:42:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1468,7 +1468,8 @@ void XMLDateFieldImportContext::ProcessAttribute( if (GetImport().GetMM100UnitConverter(). convertDateTime(fTmp, sAttrValue)) { - fTimeValue = SolarMath::ApproxFloor(fTmp); + // #96457#: don't truncate in order to read date+time + fTimeValue = fTmp; bTimeOK = sal_True; } |