diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-06-21 17:56:30 +0200 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-17 11:39:59 +0200 |
commit | 4c63e35fc028e2c5b6a8e7bd524aa94afd76405f (patch) | |
tree | 94bab01091b92672059ddf024c17163615b36e50 /xmloff | |
parent | 54c9f435270fe9df0efb1c2cf70caf901a3c6827 (diff) |
MSForms: ODF import / export of text-based date field
Reviewed-on: https://gerrit.libreoffice.org/75445
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 46a59d10dbbe3cb9bb9962df93e5a79a5318dcfd)
Change-Id: Ib535f1ce065a7f298fcccf95e82d1ffab4d1e1e2
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index ea00d0aae2cd..a2d6294c0502 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -136,6 +136,8 @@ static const char *lcl_getFormFieldmarkName(OUString const &name) else if (name == ODF_FORMDROPDOWN || name == "ecma.office-open-xml.field.FORMDROPDOWN") return ODF_FORMDROPDOWN; + else if (name == ODF_FORMDATE) + return ODF_FORMDATE; else return nullptr; } @@ -329,7 +331,8 @@ void XMLTextMarkImportContext::EndElement() OUString const type(m_rHelper.getCurrentFieldType()); fieldmarkTypeName = lcl_getFieldmarkName(type); if (fieldmarkTypeName == ODF_FORMCHECKBOX || - fieldmarkTypeName == ODF_FORMDROPDOWN) + fieldmarkTypeName == ODF_FORMDROPDOWN || + fieldmarkTypeName == ODF_FORMDATE) { // sw can't handle checkbox with start+end SAL_INFO("xmloff.text", "invalid fieldmark-start/fieldmark-end ignored"); isInvalid = true; |