New loplugin:externvar: xmloff

Change-Id: I3fe731a535fe67b4cf260f9c6a36e32732695a7c

18 files changed, 78 insertions, 59 deletions

diff --git a/xmloff/inc/enummaps.hxx b/xmloff/inc/enummaps.hxx
new file mode 100644
index 000000000000..5f543eda2355
--- /dev/null
+++ b/xmloff/inc/enummaps.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_XMLOFF_INC_ENUMMAPS_HXX
+#define INCLUDED_XMLOFF_INC_ENUMMAPS_HXX
+
+#include <sal/config.h>
+
+struct SvXMLEnumMapEntry;
+
+extern SvXMLEnumMapEntry const aXML_FillStyle_EnumMap[];
+extern SvXMLEnumMapEntry const aXML_RefPoint_EnumMap[];
+extern SvXMLEnumMapEntry const aXML_BitmapMode_EnumMap[];
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 96ff3f636746..ce1290b0ba17 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -38,7 +38,7 @@ struct SdXMLDataStyleNumber
     bool    mbDecimal02;
     const char* mpText;
 }
-    aSdXMLDataStyleNumbers[] =
+const aSdXMLDataStyleNumbers[] =
 {
     { XML_DAY,          false,      false,      false,      nullptr },
     { XML_DAY,          true,       false,      false,      nullptr },
@@ -286,7 +286,7 @@ const SdXMLFixedDataStyle aSdXML_TimeStyle_7 =
     }
 };
 
-const SdXMLFixedDataStyle* aSdXMLFixedDateFormats[SdXMLDateFormatCount] =
+const SdXMLFixedDataStyle* const aSdXMLFixedDateFormats[SdXMLDateFormatCount] =
 {
     &aSdXML_Standard_Short,
     &aSdXML_Standard_Long,
@@ -298,7 +298,7 @@ const SdXMLFixedDataStyle* aSdXMLFixedDateFormats[SdXMLDateFormatCount] =
     &aSdXML_DateStyle_6,
 };
 
-const SdXMLFixedDataStyle* aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] =
+const SdXMLFixedDataStyle* const aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] =
 {
     &aSdXML_TimeStyle_1,
     &aSdXML_TimeStyle_2,
@@ -311,7 +311,7 @@ const SdXMLFixedDataStyle* aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] =
 
 // export
 
-static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumber& rElement )
+static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumber const & rElement )
 {
     if( rElement.mbDecimal02 )
     {
@@ -361,13 +361,13 @@ static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* p
 
         while( *pElements )
         {
-            SdXMLDataStyleNumber& rElement = aSdXMLDataStyleNumbers[ (*pElements++) - 1 ];
+            SdXMLDataStyleNumber const & rElement = aSdXMLDataStyleNumbers[ (*pElements++) - 1 ];
             SdXMLExportDataStyleNumber( rExport, rElement );
         }
 
         if( pStyle2 )
         {
-            SdXMLDataStyleNumber& rElement = aSdXMLDataStyleNumbers[ DATA_STYLE_NUMBER_TEXT_SPACE - 1 ];
+            SdXMLDataStyleNumber const & rElement = aSdXMLDataStyleNumbers[ DATA_STYLE_NUMBER_TEXT_SPACE - 1 ];
             SdXMLExportDataStyleNumber( rExport, rElement );
         }
 
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index a53f07869e90..ebd625ada4cd 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -35,6 +35,7 @@
 #include <xmloff/EnumPropertyHdl.hxx>
 #include <xmloff/NamedBoolPropertyHdl.hxx>
 #include <xmloff/WordWrapPropertyHdl.hxx>
+#include "enummaps.hxx"
 #include "numithdl.hxx"
 #include "XMLBitmapRepeatOffsetPropertyHandler.hxx"
 #include "XMLFillBitmapSizePropertyHandler.hxx"
@@ -392,7 +393,7 @@ static SvXMLEnumMapEntry const aXML_LineCap_EnumMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry aXML_FillStyle_EnumMap[] =
+SvXMLEnumMapEntry const aXML_FillStyle_EnumMap[] =
 {
     { XML_NONE,     drawing::FillStyle_NONE },
     { XML_SOLID,    drawing::FillStyle_SOLID },
@@ -489,7 +490,7 @@ SvXMLEnumMapEntry const   aXML_ConnectionKind_EnumMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] =
+SvXMLEnumMapEntry const aXML_BitmapMode_EnumMap[] =
 {
     { XML_REPEAT,                   drawing::BitmapMode_REPEAT },
     { XML_STRETCH,                  drawing::BitmapMode_STRETCH },
@@ -538,7 +539,7 @@ static SvXMLEnumMapEntry const  aXML_TexMode_EnumMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry aXML_RefPoint_EnumMap[] =
+SvXMLEnumMapEntry const aXML_RefPoint_EnumMap[] =
 {
     { XML_TOP_LEFT,     drawing::RectanglePoint_LEFT_TOP },
     { XML_TOP,          drawing::RectanglePoint_MIDDLE_TOP },
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index cdc789157710..dfa0624ab87b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -114,6 +114,7 @@
 #include "sdpropls.hxx"
 #include "sdxmlexp_impl.hxx"
 #include "xexptran.hxx"
+#include "ximpshap.hxx"
 #include "XMLBase64Export.hxx"
 #include "XMLImageMapExport.hxx"
 #include <memory>
@@ -1207,9 +1208,6 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
     }
 }
 
-extern SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[];
-extern SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[];
-
 /** exports all user defined glue points */
 void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape >& xShape )
 {
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8f997e5b64fc..4015489be193 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -97,7 +97,7 @@ using namespace ::com::sun::star::document;
 using namespace ::xmloff::token;
 using namespace ::xmloff::EnhancedCustomShapeToken;
 
-SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] =
+SvXMLEnumMapEntry const aXML_GlueAlignment_EnumMap[] =
 {
     { XML_TOP_LEFT,     drawing::Alignment_TOP_LEFT },
     { XML_TOP,          drawing::Alignment_TOP },
@@ -111,7 +111,7 @@ SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] =
+SvXMLEnumMapEntry const aXML_GlueEscapeDirection_EnumMap[] =
 {
     { XML_AUTO,         drawing::EscapeDirection_SMART },
     { XML_LEFT,         drawing::EscapeDirection_LEFT },
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index fe35475eb5e4..fab0c537e29a 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -37,6 +37,8 @@
 #include <xmloff/xmlmultiimagehelper.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
+struct SvXMLEnumMapEntry;
+
 // common shape context
 
 class SdXMLShapeContext : public SvXMLShapeContext
@@ -620,6 +622,9 @@ private:
     bool maTemplateStylesUsed[6];
 };
 
+extern SvXMLEnumMapEntry const aXML_GlueAlignment_EnumMap[];
+extern SvXMLEnumMapEntry const aXML_GlueEscapeDirection_EnumMap[];
+
 #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 44165455add0..e3467d758145 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "PageMasterPropHdlFactory.hxx"
+#include "enummaps.hxx"
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "xmlbahdl.hxx"
@@ -43,11 +44,6 @@ using namespace ::com::sun::star;
 //UUUU
 using namespace ::com::sun::star::drawing;
 
-//UUUU
-extern SvXMLEnumMapEntry aXML_FillStyle_EnumMap[];
-extern SvXMLEnumMapEntry aXML_RefPoint_EnumMap[];
-extern SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[];
-
 static SvXMLEnumMapEntry const aXML_TextGridMode_ConstantMap[] =
 {
     { XML_NONE,         text::TextGridMode::NONE },
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index e6c1b66b7452..8303ee99f1d7 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -271,9 +271,9 @@ void XMLFontStyleContextFontFaceUri::SetFormat( const OUString& rFormat )
 
 // the CSS2 standard ( http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#referencing )
 // defines these format strings.
-const char* OPENTYPE_FORMAT = "opentype";
-const char* TRUETYPE_FORMAT = "truetype";
-const char* EOT_FORMAT      = "embedded-opentype";
+const char OPENTYPE_FORMAT[] = "opentype";
+const char TRUETYPE_FORMAT[] = "truetype";
+const char EOT_FORMAT[]      = "embedded-opentype";
 
 void XMLFontStyleContextFontFaceUri::EndElement()
 {
@@ -285,12 +285,12 @@ void XMLFontStyleContextFontFaceUri::EndElement()
     bool eot;
     // Assume by default that the font is not compressed.
     if( format.getLength() == 0
-        || format.equalsAscii( OPENTYPE_FORMAT )
-        || format.equalsAscii( TRUETYPE_FORMAT ))
+        || format == OPENTYPE_FORMAT
+        || format == TRUETYPE_FORMAT )
     {
         eot = false;
     }
-    else if( format.equalsAscii( EOT_FORMAT ))
+    else if( format == EOT_FORMAT )
     {
         eot = true;
     }
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index b6dde63c9cdf..6fce270b8d12 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -28,14 +28,14 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_BrushHorizontalPos[] =
+SvXMLEnumMapEntry const pXML_BrushHorizontalPos[] =
 {
     { XML_LEFT,             style::GraphicLocation_LEFT_MIDDLE   },
     { XML_RIGHT,            style::GraphicLocation_RIGHT_MIDDLE },
     { XML_TOKEN_INVALID,    0       }
 };
 
-SvXMLEnumMapEntry pXML_BrushVerticalPos[] =
+SvXMLEnumMapEntry const pXML_BrushVerticalPos[] =
 {
     { XML_TOP,              style::GraphicLocation_MIDDLE_TOP   },
     { XML_BOTTOM,           style::GraphicLocation_MIDDLE_BOTTOM    },
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 0e12efcdafa3..55ae26c0203f 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -37,7 +37,7 @@ using namespace ::xmloff::token;
 #define SVX_XML_BORDER_WIDTH_MIDDLE 1
 #define SVX_XML_BORDER_WIDTH_THICK 2
 
-SvXMLEnumMapEntry pXML_BorderStyles[] =
+SvXMLEnumMapEntry const pXML_BorderStyles[] =
 {
     { XML_NONE,          table::BorderLineStyle::NONE   },
     { XML_HIDDEN,        table::BorderLineStyle::NONE   },
@@ -56,7 +56,7 @@ SvXMLEnumMapEntry pXML_BorderStyles[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry pXML_NamedBorderWidths[] =
+SvXMLEnumMapEntry const pXML_NamedBorderWidths[] =
 {
     { XML_THIN,             SVX_XML_BORDER_WIDTH_THIN   },
     { XML_MIDDLE,           SVX_XML_BORDER_WIDTH_MIDDLE },
diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index 09152ddd7e2a..a64bc2527a4f 100644
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
@@ -27,7 +27,7 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_BreakTypes[] =
+SvXMLEnumMapEntry const pXML_BreakTypes[] =
 {
     { XML_AUTO,         0 },
     { XML_COLUMN,       1 },
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index c2443007d613..29eba7c6cbc1 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_CrossedoutType_Enum[] =
+SvXMLEnumMapEntry const pXML_CrossedoutType_Enum[] =
 {
     { XML_NONE,                 awt::FontStrikeout::NONE },
     { XML_SINGLE,   awt::FontStrikeout::SINGLE },
@@ -41,7 +41,7 @@ SvXMLEnumMapEntry pXML_CrossedoutType_Enum[] =
     { XML_TOKEN_INVALID,                0 }
 };
 
-SvXMLEnumMapEntry pXML_CrossedoutStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_CrossedoutStyle_Enum[] =
 {
     { XML_NONE,                         awt::FontStrikeout::NONE },
     { XML_SOLID,                        awt::FontStrikeout::SINGLE },
@@ -58,7 +58,7 @@ SvXMLEnumMapEntry pXML_CrossedoutStyle_Enum[] =
     { XML_TOKEN_INVALID,                0 }
 };
 
-SvXMLEnumMapEntry pXML_CrossedoutWidth_Enum[] =
+SvXMLEnumMapEntry const pXML_CrossedoutWidth_Enum[] =
 {
     { XML_AUTO,                 awt::FontStrikeout::NONE },
     { XML_AUTO,                 awt::FontStrikeout::SINGLE },
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 9501afc85688..c566dfa13592 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -32,7 +32,7 @@
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry pXML_tabstop_style[] =
+SvXMLEnumMapEntry const pXML_tabstop_style[] =
 {
     { XML_LEFT,     style::TabAlign_LEFT    },
     { XML_CENTER,   style::TabAlign_CENTER  },
diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx
index a2c042809a53..d1c2859d6253 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.cxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.cxx
@@ -197,7 +197,7 @@ enum TemplateTokenType
 };
 
 
-SvXMLEnumMapEntry aTemplateTokenTypeMap[] =
+SvXMLEnumMapEntry const aTemplateTokenTypeMap[] =
 {
     { XML_INDEX_ENTRY_TEXT,         XML_TOK_INDEX_TYPE_ENTRY_TEXT },
     { XML_INDEX_ENTRY_TAB_STOP,     XML_TOK_INDEX_TYPE_TAB_STOP },
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 3de39a76bd4e..e79609004484 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -42,6 +42,7 @@
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmltoken.hxx>
 #include "XMLAnchorTypePropHdl.hxx"
+#include "enummaps.hxx"
 #include <xmloff/XMLConstantsPropertyHandler.hxx>
 #include "XMLClipPropertyHandler.hxx"
 #include "XMLTextColumnsPropertyHandler.hxx"
@@ -67,11 +68,6 @@ using namespace ::xmloff::token;
 //UUUU
 using namespace ::com::sun::star::drawing;
 
-//UUUU
-extern SvXMLEnumMapEntry aXML_FillStyle_EnumMap[];
-extern SvXMLEnumMapEntry aXML_RefPoint_EnumMap[];
-extern SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[];
-
 static SvXMLEnumMapEntry const pXML_HoriPos_Enum[] =
 {
     { XML_FROM_LEFT,        HoriOrientation::NONE   },
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index c34e644fdba9..eaaff4690d98 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -86,7 +86,7 @@ using namespace ::xmloff::token;
 #define MAP_(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
 #define GMAP(name,prefix,token,type,context) MAP_(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context)
 
-XMLPropertyMapEntry aXMLParaPropMap[] =
+XMLPropertyMapEntry const aXMLParaPropMap[] =
 {
     // RES_UNKNOWNATR_CONTAINER
     MP_E( "ParaUserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
@@ -459,7 +459,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
 };
 
 
-XMLPropertyMapEntry aXMLAdditionalTextDefaultsMap[] =
+XMLPropertyMapEntry const aXMLAdditionalTextDefaultsMap[] =
 {
     // RES_FOLLOW_TEXT_FLOW - DVO #i18732#
     MG_ED( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT,      XML_TYPE_BOOL, 0 ),
@@ -470,7 +470,7 @@ XMLPropertyMapEntry aXMLAdditionalTextDefaultsMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLTextPropMap[] =
+XMLPropertyMapEntry const aXMLTextPropMap[] =
 {
     // RES_CHRATR_CASEMAP
     MT_E( "CharCaseMap",        FO,     FONT_VARIANT,       XML_TYPE_TEXT_CASEMAP_VAR,  0 ),
@@ -673,7 +673,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLFramePropMap[] =
+XMLPropertyMapEntry const aXMLFramePropMap[] =
 {
     // RES_FILL_ORDER
     // TODO: not required???
@@ -879,7 +879,7 @@ XMLPropertyMapEntry aXMLFramePropMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLShapePropMap[] =
+XMLPropertyMapEntry const aXMLShapePropMap[] =
 {
     // RES_LR_SPACE
     MG_E( "LeftMargin",             FO, MARGIN_LEFT,        XML_TYPE_MEASURE,  0),
@@ -924,7 +924,7 @@ XMLPropertyMapEntry aXMLShapePropMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLSectionPropMap[] =
+XMLPropertyMapEntry const aXMLSectionPropMap[] =
 {
     // RES_COL
     MS_E( "TextColumns",            STYLE,  COLUMNS,    MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_COLUMNS, CTF_TEXTCOLUMNS ),
@@ -970,7 +970,7 @@ XMLPropertyMapEntry aXMLSectionPropMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLRubyPropMap[] =
+XMLPropertyMapEntry const aXMLRubyPropMap[] =
 {
     MR_E( "RubyAdjust", STYLE, RUBY_ALIGN, XML_TYPE_TEXT_RUBY_ADJUST, 0 ),
     MR_E( "RubyIsAbove",    STYLE, RUBY_POSITION, XML_TYPE_TEXT_RUBY_POSITION, 0 ),
@@ -978,7 +978,7 @@ XMLPropertyMapEntry aXMLRubyPropMap[] =
 };
 
 
-XMLPropertyMapEntry aXMLTableDefaultsMap[] =
+XMLPropertyMapEntry const aXMLTableDefaultsMap[] =
 {
     // RES_COLLAPSING_BORDERS: only occurs in tables, but we need to
     // read/write the default for this item
@@ -987,7 +987,7 @@ XMLPropertyMapEntry aXMLTableDefaultsMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLTableRowDefaultsMap[] =
+XMLPropertyMapEntry const aXMLTableRowDefaultsMap[] =
 {
     // RES_ROW_SPLIT: only occurs in table rows, but we need to
     // read/write the default for this item
@@ -996,7 +996,7 @@ XMLPropertyMapEntry aXMLTableRowDefaultsMap[] =
     M_END()
 };
 
-XMLPropertyMapEntry aXMLCellPropMap[] =
+XMLPropertyMapEntry const aXMLCellPropMap[] =
 {
     MC_E( "BackColor",            FO,    BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ),
     MC_E( "LeftBorder",           FO,    BORDER_LEFT,      XML_TYPE_BORDER,                                   0 ),
@@ -1064,9 +1064,9 @@ XMLPropertyMapEntry aXMLCellPropMap[] =
     M_END()
 };
 
-static XMLPropertyMapEntry *lcl_txtprmap_getMap( TextPropMap nType )
+static XMLPropertyMapEntry const *lcl_txtprmap_getMap( TextPropMap nType )
 {
-    XMLPropertyMapEntry *pMap = nullptr;
+    XMLPropertyMapEntry const *pMap = nullptr;
     switch( nType )
     {
     case TextPropMap::TEXT:
diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index 8dea091fd10d..0e4969ccbfec 100644
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -33,7 +33,7 @@ using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-XMLTokenEnum aMetaTokens[] =
+XMLTokenEnum const aMetaTokens[] =
 {
     XML_GENERATOR,
     XML_TITLE,
@@ -85,7 +85,7 @@ void XMLMetaTransformerContext::EndElement()
 {
     // export everything in the correct order
     OUString aKeywordsQName;
-    XMLTokenEnum *pToken = aMetaTokens;
+    XMLTokenEnum const *pToken = aMetaTokens;
     while( *pToken != XML_TOKEN_END )
     {
         const OUString& rToken = GetXMLToken( *pToken );
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index b0f8b92e3309..8f19b53910e2 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -132,11 +132,11 @@ void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& aDate );
 void xforms_formatTime( OUStringBuffer& aBuffer, const css::util::Time& aTime );
 void xforms_formatDateTime( OUStringBuffer& aBuffer, const util::DateTime& aDateTime );
 
-convert_t xforms_int32    = &xforms_convert<sal_Int32,&::sax::Converter::convertNumber>;
-convert_t xforms_double   = &xforms_convert<double,&::sax::Converter::convertDouble>;
-convert_t xforms_dateTime = &xforms_convertRef<util::DateTime,&xforms_formatDateTime>;
-convert_t xforms_date     = &xforms_convertRef<util::Date,&xforms_formatDate>;
-convert_t xforms_time     = &xforms_convertRef<css::util::Time,&xforms_formatTime>;
+convert_t const xforms_int32    = &xforms_convert<sal_Int32,&::sax::Converter::convertNumber>;
+convert_t const xforms_double   = &xforms_convert<double,&::sax::Converter::convertDouble>;
+convert_t const xforms_dateTime = &xforms_convertRef<util::DateTime,&xforms_formatDateTime>;
+convert_t const xforms_date     = &xforms_convertRef<util::Date,&xforms_formatDate>;
+convert_t const xforms_time     = &xforms_convertRef<css::util::Time,&xforms_formatTime>;
 
 // other functions
 static OUString lcl_getXSDType( SvXMLExport& rExport,