From 46a59d10dbbe3cb9bb9962df93e5a79a5318dcfd Mon Sep 17 00:00:00 2001 From: Tamás Zolnai Date: Fri, 21 Jun 2019 17:56:30 +0200 Subject: MSForms: ODF import / export of text-based date field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib535f1ce065a7f298fcccf95e82d1ffab4d1e1e2 Reviewed-on: https://gerrit.libreoffice.org/75445 Tested-by: Jenkins Reviewed-by: Tamás Zolnai --- xmloff/source/text/XMLTextMarkImportContext.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xmloff') diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 62e58c8a84c1..aff9a18c38d1 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -137,6 +137,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; } @@ -330,7 +332,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; -- cgit