diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-10 18:22:31 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-17 11:40:00 +0200 |
| commit | 047220d82b3eefa5fdeec186752b70205a16369b (patch) | |
| tree | b4b8fcfca643326bc64b91d8cef31dc5e502297d /xmloff | |
| parent | 38229d47b2aec0f49da56ce937a203a8b4ca1fb3 (diff) | |
MSForms: Rework text-based date form field's representation
* Better to represent it similar to text form field with two
marking characters selecting a text range
* So the text between the two marks can be anything (not only
a well formatted date) and also have any character formatting.
* With this we handle the case when the user needs a placeholder
text in the date field or when the user needs time values (hour,
minute, sec) next to the date.
Reviewed-on: https://gerrit.libreoffice.org/75459
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 68e1be4ccbb90ee9a788962219a88312c4ffbea2)
Change-Id: Id60a50a2028058f8a6a080e265c0730d88b98543
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index a2d6294c0502..ea00d0aae2cd 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -136,8 +136,6 @@ 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; } @@ -331,8 +329,7 @@ void XMLTextMarkImportContext::EndElement() OUString const type(m_rHelper.getCurrentFieldType()); fieldmarkTypeName = lcl_getFieldmarkName(type); if (fieldmarkTypeName == ODF_FORMCHECKBOX || - fieldmarkTypeName == ODF_FORMDROPDOWN || - fieldmarkTypeName == ODF_FORMDATE) + fieldmarkTypeName == ODF_FORMDROPDOWN) { // sw can't handle checkbox with start+end SAL_INFO("xmloff.text", "invalid fieldmark-start/fieldmark-end ignored"); isInvalid = true; |