From f30530229bb47c373fb99bb3f90bac77d5c8a116 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Mon, 24 Jul 2017 23:33:29 +0900
Subject: 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>
---
 xmloff/source/xforms/TokenContext.cxx | 2 +-
 xmloff/source/xforms/TokenContext.hxx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'xmloff/source/xforms')

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
-- 
cgit