diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-11-16 13:24:39 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2016-11-16 10:29:15 +0000 |
| commit | 722ea624fdb1ae3c5009b9dadc5699dc3724c649 (patch) | |
| tree | b2cb765daa0fd2cdf981eef7de2815a750c2b001 /xmloff | |
| parent | e06bacfc533dc490840067997fd5bcb1dc60dbc5 (diff) | |
Small housekeeping: merged two if's with same result into one
Change-Id: I63e038173338055b5b4003e1a6040b8680b8bbd6
Reviewed-on: https://gerrit.libreoffice.org/30901
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 4f6c3b1e32f4..4f2159c3ab65 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -128,11 +128,10 @@ static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] = static const char *lcl_getFormFieldmarkName(OUString &name) { - if (name == "msoffice.field.FORMCHECKBOX" || + if (name == ODF_FORMCHECKBOX || + name == "msoffice.field.FORMCHECKBOX" || name == "ecma.office-open-xml.field.FORMCHECKBOX") return ODF_FORMCHECKBOX; - else if (name == ODF_FORMCHECKBOX) - return ODF_FORMCHECKBOX; else if (name == ODF_FORMDROPDOWN || name == "ecma.office-open-xml.field.FORMDROPDOWN") return ODF_FORMDROPDOWN; |