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 11:31:55 +0100 |
| commit | ba4dfeb67f846665779bf1524c23499616da61f2 (patch) | |
| tree | b058fb4f5e78d4235e7bb01ae30f956ad8a8324f | |
| parent | a62360c3b9f3d6516a4a66331bea9e767dfb5939 (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 3f1c069f46..1337bc77b0 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); |