Kaydet (Commit) f3053022 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Michael Stahl

Mark SvXMLTokenMapEntry arrays as constant

Change-Id: I37565540ec5dc3bfddf6cdeb20447f837e3014b6
Reviewed-on: https://gerrit.libreoffice.org/40374Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst b115c1cd
...@@ -51,7 +51,7 @@ enum SvXMLTokenMapAttrs ...@@ -51,7 +51,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_BGIMG_FILTER, XML_TOK_BGIMG_FILTER,
}; };
static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = static const SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{ {
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
......
...@@ -99,7 +99,7 @@ enum SwXMLDocTokens ...@@ -99,7 +99,7 @@ enum SwXMLDocTokens
XML_TOK_DOC_XFORMS, XML_TOK_DOC_XFORMS,
}; };
static SvXMLTokenMapEntry aDocTokenMap[] = static const SvXMLTokenMapEntry aDocTokenMap[] =
{ {
{ XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
......
...@@ -73,7 +73,7 @@ enum XMLImageMapToken: decltype(XML_TOK_UNKNOWN) ...@@ -73,7 +73,7 @@ enum XMLImageMapToken: decltype(XML_TOK_UNKNOWN)
XML_TOK_IMAP_TARGET XML_TOK_IMAP_TARGET
}; };
static SvXMLTokenMapEntry aImageMapObjectTokenMap[] = static const SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
{ {
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME },
......
...@@ -50,7 +50,7 @@ enum SvXMLTokenMapAttrs ...@@ -50,7 +50,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_DASH_DISTANCE, XML_TOK_DASH_DISTANCE,
}; };
static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = static const SvXMLTokenMapEntry aDashStyleAttrTokenMap[] =
{ {
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME }, { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME },
......
...@@ -63,7 +63,7 @@ using namespace ::com::sun::star::container; ...@@ -63,7 +63,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::style; using namespace ::com::sun::star::style;
using namespace ::xmloff::token; using namespace ::xmloff::token;
static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = static const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
{ {
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE }, { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE },
{ XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER }, { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER },
......
...@@ -43,7 +43,7 @@ enum SvXMLTokenMapAttrs ...@@ -43,7 +43,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_LEADER_TEXT 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_POSITION, XML_TOK_TABSTOP_POSITION },
{ XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE }, { XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE },
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
using com::sun::star::uno::Reference; using com::sun::star::uno::Reference;
using com::sun::star::xml::sax::XAttributeList; using com::sun::star::xml::sax::XAttributeList;
struct SvXMLTokenMapEntry aEmptyMap[1] = const SvXMLTokenMapEntry aEmptyMap[1] =
{ {
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_XMLOFF_SOURCE_XFORMS_TOKENCONTEXT_HXX #define INCLUDED_XMLOFF_SOURCE_XFORMS_TOKENCONTEXT_HXX
#include <xmloff/xmlictxt.hxx> #include <xmloff/xmlictxt.hxx>
#include <xmloff/xmltkmap.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace xml { namespace sax { class XAttributeList; } } namespace xml { namespace sax { class XAttributeList; } }
...@@ -31,7 +32,7 @@ class SvXMLImport; ...@@ -31,7 +32,7 @@ class SvXMLImport;
#define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN } #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 */ /** handle attributes through an SvXMLTokenMap */
class TokenContext : public SvXMLImportContext class TokenContext : public SvXMLImportContext
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment