diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-07-24 23:33:29 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-26 20:44:20 +0200 |
| commit | f30530229bb47c373fb99bb3f90bac77d5c8a116 (patch) | |
| tree | 1bd89236408e73214cf7679568315879bdb67d0b /xmloff | |
| parent | b115c1cd99b167600158665a5b0dff4c90a21b55 (diff) | |
Mark SvXMLTokenMapEntry arrays as constant
Change-Id: I37565540ec5dc3bfddf6cdeb20447f837e3014b6
Reviewed-on: https://gerrit.libreoffice.org/40374
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/XMLImageMapContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/DashStyle.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/xmlstyle.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/xmltabi.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/xforms/TokenContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/xforms/TokenContext.hxx | 3 |
6 files changed, 7 insertions, 6 deletions
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index d7d967bd2202..fdc1f145be60 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -73,7 +73,7 @@ enum XMLImageMapToken: decltype(XML_TOK_UNKNOWN) XML_TOK_IMAP_TARGET }; -static SvXMLTokenMapEntry aImageMapObjectTokenMap[] = +static const SvXMLTokenMapEntry aImageMapObjectTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME }, diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index bbb49ba29945..f68e535d7ebc 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -50,7 +50,7 @@ enum SvXMLTokenMapAttrs XML_TOK_DASH_DISTANCE, }; -static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = +static const SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME }, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index a44a04321b62..40014f2c6bbe 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; using namespace ::xmloff::token; -static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = +static const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE }, { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER }, diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 0e4c1ca665b5..b7efacba6027 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -43,7 +43,7 @@ enum SvXMLTokenMapAttrs XML_TOK_TABSTOP_LEADER_TEXT }; -static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = +static const SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION }, { XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE }, diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index 2b3fb58f1f11..22dd5747c895 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -30,7 +30,7 @@ using com::sun::star::uno::Reference; using com::sun::star::xml::sax::XAttributeList; -struct SvXMLTokenMapEntry aEmptyMap[1] = +const SvXMLTokenMapEntry aEmptyMap[1] = { XML_TOKEN_MAP_END }; diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index a19b8503758e..fe26c740488a 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -21,6 +21,7 @@ #define INCLUDED_XMLOFF_SOURCE_XFORMS_TOKENCONTEXT_HXX #include <xmloff/xmlictxt.hxx> +#include <xmloff/xmltkmap.hxx> namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -31,7 +32,7 @@ class SvXMLImport; #define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN } -extern struct SvXMLTokenMapEntry aEmptyMap[1]; +extern const SvXMLTokenMapEntry aEmptyMap[1]; /** handle attributes through an SvXMLTokenMap */ class TokenContext : public SvXMLImportContext |