diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-12-09 11:31:02 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-12-09 14:53:44 +0100 |
| commit | 0a50eaf32dcbe3937a0ebd4b258e0cc4ed054e17 (patch) | |
| tree | 45a4998c5d5dab278759471a4c1ee7fee0aefc43 | |
| parent | 19d2c4a4ba7a5e512afdc206c73e1c648ce3030a (diff) | |
fdo#32172: backward import compatibility for old go-oo enhanced fields names
| -rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 3ac7b6f48b0b..ecaf9add0c89 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -147,11 +147,13 @@ static const char *lcl_getFormFieldmarkName(rtl::OUString &name) { static const char sCheckbox[]=ODF_FORMCHECKBOX; static const char sFormDropDown[]=ODF_FORMDROPDOWN; - if (name.compareToAscii("msoffice.field.FORMCHECKBOX")==0) + if (name.compareToAscii("msoffice.field.FORMCHECKBOX")==0 || + name.compareToAscii("ecma.office-open-xml.field.FORMCHECKBOX")==0) return sCheckbox; else if (name.compareToAscii(ODF_FORMCHECKBOX)==0) return sCheckbox; - if (name.compareToAscii(ODF_FORMDROPDOWN)==0) + if (name.compareToAscii(ODF_FORMDROPDOWN)==0 || + name.compareToAscii("ecma.office-open-xml.field.FORMDROPDOWN")==0) return sFormDropDown; else return NULL; @@ -160,7 +162,8 @@ static const char *lcl_getFormFieldmarkName(rtl::OUString &name) static rtl::OUString lcl_getFieldmarkName(rtl::OUString &name) { static const char sFormtext[]=ODF_FORMTEXT; - if (name.compareToAscii("msoffice.field.FORMTEXT")==0) + if (name.compareToAscii("msoffice.field.FORMTEXT")==0 || + name.compareToAscii("ecma.office-open-xml.field.FORMTEXT")==0) return rtl::OUString::createFromAscii(sFormtext); else if (name.compareToAscii(ODF_FORMTEXT)==0) return rtl::OUString::createFromAscii(sFormtext); |