diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-10 15:14:00 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-10 15:28:53 +0100 |
| commit | cc407e50e8a1a74f9d1ed29d444dce9bd2e9167a (patch) | |
| tree | c7ef90848446a9c961f694e0a2f772a17198319f /xmloff/inc | |
| parent | 1235e694c21f6e3e000e24a176123c386ea91df1 (diff) | |
sax, xmloff: fix ODF import/export of text:time/text:time-value
The value written for an Impress time field is something like
text:time-value="0000-00-00T23:28:07" (in LO 3.5+) or
text:time-value="0-00-00T23:28:07" (in OOo 3.3) which contains an
invalid all-zero date. Such values are actually rejected by the
ODF import since commit ae3e2f170045a1525f67e9f3e9b7e03d94f2b56b.
Actually there was no real support to read the RelaxNG type
timeOrDateTime before.
So fix that by:
- adding convertTimeOrDateTime/parseTimeOrDateTime functions to
sax::Converter
- recognizing and ignoring the 2 invalid all-zero values written by
LO 3.5 and historic OOo respectively
- writing a bare "time" in text:time-value if the DateTime struct
contains zero Date members
(Older OOo versions and AOO cannot actually read that, but everything
they _can_ read is invalid ODF...)
Change-Id: I754076caee74a5163ed3f972af0f23796aa14f9f
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/txtflde.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index 6d5b38755fa1..6728690074d0 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -366,6 +366,12 @@ protected: sal_Bool bIsDate, /// export as date (rather than date/time)? sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix + /// export time or dateTime + void ProcessTimeOrDateTime( + enum ::xmloff::token::XMLTokenEnum eXMLName, /// attribute token + const ::com::sun::star::util::DateTime& rTime, /// date/time value + sal_uInt16 nPrefix = XML_NAMESPACE_TEXT); /// attribute name prefix + /// export all attributes for bibliography data fields void ProcessBibliographyData( const ::com::sun::star::uno::Reference < |