diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-31 10:27:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-31 10:32:27 +0000 |
| commit | 1b36f23b516b44ccccf64f294c35073088835e5f (patch) | |
| tree | 873892c685b0a963750c52a404c87a1d2adb7a11 /xmloff/source/text/XMLTextMarkImportContext.cxx | |
| parent | aeeabc36fd0a4a71238c8c3df2e80ea324f9bac0 (diff) | |
loplugin:oncevar in xmloff..xmlsecurity
Change-Id: I2353d3c73130ed9420e8d803a9a96a06549bb6bd
Reviewed-on: https://gerrit.libreoffice.org/30429
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/text/XMLTextMarkImportContext.cxx')
| -rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 22027c3edcb2..4f6c3b1e32f4 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -128,16 +128,14 @@ static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] = static const char *lcl_getFormFieldmarkName(OUString &name) { - static const char sCheckbox[]=ODF_FORMCHECKBOX; - static const char sFormDropDown[]=ODF_FORMDROPDOWN; if (name == "msoffice.field.FORMCHECKBOX" || name == "ecma.office-open-xml.field.FORMCHECKBOX") - return sCheckbox; + return ODF_FORMCHECKBOX; else if (name == ODF_FORMCHECKBOX) - return sCheckbox; - if (name == ODF_FORMDROPDOWN || - name == "ecma.office-open-xml.field.FORMDROPDOWN") - return sFormDropDown; + return ODF_FORMCHECKBOX; + else if (name == ODF_FORMDROPDOWN || + name == "ecma.office-open-xml.field.FORMDROPDOWN") + return ODF_FORMDROPDOWN; else return nullptr; } @@ -179,10 +177,7 @@ void XMLTextMarkImportContext::EndElement() { SvXMLImportContext::EndElement(); - static const char sAPI_reference_mark[] = "com.sun.star.text.ReferenceMark"; static const char sAPI_bookmark[] = "com.sun.star.text.Bookmark"; - static const char sAPI_fieldmark[] = "com.sun.star.text.Fieldmark"; - static const char sAPI_formfieldmark[] = "com.sun.star.text.FormFieldmark"; if (!m_sBookmarkName.isEmpty()) { @@ -195,7 +190,7 @@ void XMLTextMarkImportContext::EndElement() case TypeReference: // export point reference mark CreateAndInsertMark(GetImport(), - sAPI_reference_mark, + "com.sun.star.text.ReferenceMark", m_sBookmarkName, m_rHelper.GetCursorAsRange()->getStart()); break; @@ -223,7 +218,7 @@ void XMLTextMarkImportContext::EndElement() // export point bookmark const Reference<XInterface> xContent( CreateAndInsertMark(GetImport(), - (bImportAsField ? OUString(sAPI_formfieldmark) : OUString(sAPI_bookmark)), + (bImportAsField ? OUString("com.sun.star.text.FormFieldmark") : OUString(sAPI_bookmark)), m_sBookmarkName, m_rHelper.GetCursorAsRange()->getStart(), m_sXmlId) ); @@ -341,7 +336,7 @@ void XMLTextMarkImportContext::EndElement() // insert reference xContent = CreateAndInsertMark(GetImport(), (bImportAsField - ? OUString(sAPI_fieldmark) + ? OUString("com.sun.star.text.Fieldmark") : OUString(sAPI_bookmark)), m_sBookmarkName, xInsertionCursor, |