summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-06-21 17:56:30 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2019-07-12 03:17:16 +0200
commit46a59d10dbbe3cb9bb9962df93e5a79a5318dcfd (patch)
tree755799d2146250c746aff02c8b615c70e2b6f4e9 /xmloff
parent1df055ba2a01a4c83d90c7c64998e7950ca8d795 (diff)
MSForms: ODF import / export of text-based date field
Change-Id: Ib535f1ce065a7f298fcccf95e82d1ffab4d1e1e2 Reviewed-on: https://gerrit.libreoffice.org/75445 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx5
1 files changed, 4 insertions, 1 deletions
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;