[Libreoffice-commits] core.git: xmloff/source

[Mike Kaganski]

 xmloff/source/text/XMLTextMarkImportContext.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 722ea624fdb1ae3c5009b9dadc5699dc3724c649
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Nov 16 13:24:39 2016 +0300

    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 at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 4f6c3b1..4f2159c 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;