Mark as static and/or const

Change-Id: I45a890bb793a6d92546c05bd75738d4dd753a01e

21 files changed, 133 insertions, 133 deletions

diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index e10dea6641ae..3a55350985da 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -43,7 +43,7 @@ const sal_uInt16 Animations_EnumMap_SubItem = 13;
 const sal_uInt16 Animations_EnumMap_IterateType = 14;
 const sal_uInt16 Animations_EnumMap_Command = 15;
 
-extern SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap );
+extern const SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap );
 
 struct ImplAttributeNameConversion
 {
@@ -51,7 +51,7 @@ struct ImplAttributeNameConversion
     const sal_Char* mpAPIName;
 };
 
-extern struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList();
+extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList();
 
 }
 
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 91ba2825a44f..3c43f5feaa79 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -180,7 +180,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap()
 {
     if( ! mpChartDocElemTokenMap )
     {
-        static SvXMLTokenMapEntry aDocElemTokenMap[] =
+        static const SvXMLTokenMapEntry aDocElemTokenMap[] =
         {
             { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES,   XML_TOK_DOC_AUTOSTYLES  },
             { XML_NAMESPACE_OFFICE, XML_STYLES,             XML_TOK_DOC_STYLES  },
@@ -199,7 +199,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap()
 {
     if( ! mpTableElemTokenMap )
     {
-        static SvXMLTokenMapEntry aTableElemTokenMap[] =
+        static const SvXMLTokenMapEntry aTableElemTokenMap[] =
     {
         { XML_NAMESPACE_TABLE,  XML_TABLE_HEADER_COLUMNS,   XML_TOK_TABLE_HEADER_COLS   },
         { XML_NAMESPACE_TABLE,  XML_TABLE_COLUMNS,          XML_TOK_TABLE_COLUMNS       },
@@ -220,7 +220,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap()
 {
     if( ! mpChartElemTokenMap )
     {
-        static SvXMLTokenMapEntry aChartElemTokenMap[] =
+        static const SvXMLTokenMapEntry aChartElemTokenMap[] =
         {
             { XML_NAMESPACE_CHART,  XML_PLOT_AREA,              XML_TOK_CHART_PLOT_AREA     },
             { XML_NAMESPACE_CHART,  XML_TITLE,                  XML_TOK_CHART_TITLE         },
@@ -240,7 +240,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
 {
     if( ! mpPlotAreaElemTokenMap )
     {
-        static SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
+        static const SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
 {
     { XML_NAMESPACE_CHART_EXT,  XML_COORDINATE_REGION,      XML_TOK_PA_COORDINATE_REGION_EXT },
     { XML_NAMESPACE_CHART,  XML_COORDINATE_REGION,      XML_TOK_PA_COORDINATE_REGION },
@@ -265,7 +265,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
 {
     if( ! mpSeriesElemTokenMap )
     {
-        static SvXMLTokenMapEntry aSeriesElemTokenMap[] =
+        static const SvXMLTokenMapEntry aSeriesElemTokenMap[] =
 {
     { XML_NAMESPACE_CHART,  XML_DATA_POINT,       XML_TOK_SERIES_DATA_POINT       },
     { XML_NAMESPACE_CHART,  XML_DOMAIN,           XML_TOK_SERIES_DOMAIN           },
@@ -287,7 +287,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
 {
     if( ! mpChartAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aChartAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aChartAttrTokenMap[] =
 {
     { XML_NAMESPACE_XLINK,  XML_HREF,                   XML_TOK_CHART_HREF          },
     { XML_NAMESPACE_CHART,  XML_CLASS,                  XML_TOK_CHART_CLASS         },
@@ -309,7 +309,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
 {
     if( ! mpPlotAreaAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,    XML_X,                      XML_TOK_PA_X                 },
     { XML_NAMESPACE_SVG,    XML_Y,                      XML_TOK_PA_Y                 },
@@ -342,7 +342,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
 {
     if( ! mpCellAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aCellAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aCellAttrTokenMap[] =
 {
     { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE,             XML_TOK_CELL_VAL_TYPE       },
     { XML_NAMESPACE_OFFICE, XML_VALUE,                  XML_TOK_CELL_VALUE          },
@@ -359,7 +359,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap()
 {
     if( ! mpSeriesAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
 {
     { XML_NAMESPACE_CHART,  XML_VALUES_CELL_RANGE_ADDRESS,  XML_TOK_SERIES_CELL_RANGE    },
     { XML_NAMESPACE_CHART,  XML_LABEL_CELL_ADDRESS,         XML_TOK_SERIES_LABEL_ADDRESS },
@@ -379,7 +379,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
 {
     if( ! mpRegEquationAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
 {
     { XML_NAMESPACE_CHART,  XML_STYLE_NAME,             XML_TOK_REGEQ_STYLE_NAME         },
     { XML_NAMESPACE_CHART,  XML_DISPLAY_EQUATION,       XML_TOK_REGEQ_DISPLAY_EQUATION   },
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index d144656e7a34..a35a1daa01cc 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -202,7 +202,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
         { CTF_SD_OLE_VIS_AREA_IMPORT_HEIGHT, -1 },
         { -1, -1 }
     };
-    static sal_uInt16 aFamilies[] =
+    static const sal_uInt16 aFamilies[] =
     {
         XML_STYLE_FAMILY_SD_STROKE_DASH_ID,
         XML_STYLE_FAMILY_SD_MARKER_ID,
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 06ca5ac77757..14a63c392db1 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -91,13 +91,13 @@ using ::com::sun::star::container::XEnumeration;
 namespace xmloff
 {
 
-SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
+const SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
 {
     switch( nMap )
     {
     case Animations_EnumMap_Fill:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
             {
                 { XML_DEFAULT,      AnimationFill::DEFAULT },
                 { XML_REMOVE,       AnimationFill::REMOVE },
@@ -111,7 +111,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_FillDefault:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[] =
             {
                 { XML_INHERIT,      AnimationFill::INHERIT },
                 { XML_REMOVE,       AnimationFill::REMOVE },
@@ -125,7 +125,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_Restart:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_Restart[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_Restart[] =
             {
                 { XML_DEFAULT,      AnimationRestart::DEFAULT },
                 { XML_ALWAYS,       AnimationRestart::ALWAYS },
@@ -137,7 +137,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_RestartDefault:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_RestartDefault[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_RestartDefault[] =
             {
                 { XML_INHERIT,      AnimationRestart::INHERIT },
                 { XML_ALWAYS,       AnimationRestart::ALWAYS },
@@ -149,7 +149,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_Endsync:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_Endsync[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_Endsync[] =
             {
                 { XML_FIRST,        AnimationEndSync::FIRST },
                 { XML_LAST,         AnimationEndSync::LAST },
@@ -161,7 +161,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_CalcMode:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_CalcMode[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_CalcMode[] =
             {
                 { XML_DISCRETE,     AnimationCalcMode::DISCRETE },
                 { XML_LINEAR,       AnimationCalcMode::LINEAR },
@@ -173,7 +173,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_AdditiveMode:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_AdditiveMode[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_AdditiveMode[] =
             {
                 { XML_BASE,         AnimationAdditiveMode::BASE },
                 { XML_SUM,          AnimationAdditiveMode::SUM },
@@ -186,7 +186,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_TransformType:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_TransformType[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_TransformType[] =
             {
                 { XML_TRANSLATE,    AnimationTransformType::TRANSLATE },
                 { XML_SCALE,        AnimationTransformType::SCALE },
@@ -199,7 +199,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_TransitionType:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_TransitionType[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_TransitionType[] =
             {
                 { XML_BARWIPE,          TransitionType::BARWIPE },
                 { XML_BOXWIPE,          TransitionType::BOXWIPE },
@@ -250,7 +250,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_TransitionSubType:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_TransitionSubType[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_TransitionSubType[] =
             {
                 { XML_DEFAULT,              TransitionSubType::DEFAULT },
                 { XML_LEFTTORIGHT,          TransitionSubType::LEFTTORIGHT },
@@ -375,7 +375,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_EventTrigger:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_EventTrigger[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_EventTrigger[] =
             {
                 { XML_ONBEGIN,          EventTrigger::ON_BEGIN },
                 { XML_ONEND,            EventTrigger::ON_END },
@@ -396,7 +396,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
 
     case Animations_EnumMap_EffectPresetClass:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_EffectPresetClass[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_EffectPresetClass[] =
             {
                 { XML_CUSTOM,       EffectPresetClass::CUSTOM },
                 { XML_ENTRANCE,     EffectPresetClass::ENTRANCE },
@@ -412,7 +412,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
 
     case Animations_EnumMap_EffectNodeType:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_EffectNodeType[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_EffectNodeType[] =
             {
                 { XML_DEFAULT,                  EffectNodeType::DEFAULT },
                 { XML_ON_CLICK,                 EffectNodeType::ON_CLICK },
@@ -427,7 +427,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_SubItem:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_SubItem[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_SubItem[] =
             {
                 { XML_WHOLE,                    ShapeAnimationSubType::AS_WHOLE },
                 { XML_BACKGROUND,               ShapeAnimationSubType::ONLY_BACKGROUND },
@@ -438,7 +438,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_IterateType:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_IterateType[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_IterateType[] =
             {
                 { XML_BY_PARAGRAPH,             TextAnimationType::BY_PARAGRAPH },
                 { XML_BY_WORD,                  TextAnimationType::BY_WORD },
@@ -449,7 +449,7 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
         }
     case Animations_EnumMap_Command:
         {
-            static SvXMLEnumMapEntry aAnimations_EnumMap_Command[] =
+            static const SvXMLEnumMapEntry aAnimations_EnumMap_Command[] =
             {
                 { XML_CUSTOM,                   EffectCommands::CUSTOM },
                 { XML_VERB,                     EffectCommands::VERB },
@@ -467,9 +467,9 @@ SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap )
     return NULL;
 }
 
-struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList()
+const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList()
 {
-    static struct ImplAttributeNameConversion gImplConversionList[] =
+    static const struct ImplAttributeNameConversion gImplConversionList[] =
     {
         { XML_X,                        "X" },
         { XML_Y,                        "Y" },
@@ -1137,7 +1137,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
             OUString sTemp( xAnimate->getAttributeName() );
             if( !sTemp.isEmpty() )
             {
-                ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
+                const struct ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
                 while( p->mpAPIName )
                 {
                     if( sTemp.compareToAscii( p->mpAPIName ) == 0 )
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index f3bb2ffd872f..99beb23a349f 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -145,7 +145,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap()
 {
     if( mpAnimationNodeTokenMap == NULL )
     {
-        static SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
+        static const SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
         {
             { XML_NAMESPACE_ANIMATION,  XML_PAR,                (sal_uInt16)AnimationNodeType::PAR },
             { XML_NAMESPACE_ANIMATION,  XML_SEQ,                (sal_uInt16)AnimationNodeType::SEQ },
@@ -224,7 +224,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM
 {
     if( mpAnimationNodeAttributeTokenMap == NULL )
     {
-        static SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
+        static const SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
         {
             { XML_NAMESPACE_SMIL, XML_BEGIN,                    (sal_uInt16)ANA_Begin },
             { XML_NAMESPACE_SMIL, XML_DUR,                      (sal_uInt16)ANA_Dur },
@@ -946,7 +946,7 @@ void AnimationNodeContext::init_node(  const ::com::sun::star::uno::Reference< :
                 {
                     OUString aName( rValue );
 
-                    ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
+                    const struct ImplAttributeNameConversion* p = getAnimationAttributeNamesConversionList();
                     while( p->mpAPIName )
                     {
                         if( IsXMLToken( aName, p->meXMLToken ) )
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index fe4d766f9b4b..2c5e302ac80e 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -482,7 +482,7 @@ const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap()
 {
     if(!mpDocElemTokenMap)
     {
-        static SvXMLTokenMapEntry aDocElemTokenMap[] =
+        static const SvXMLTokenMapEntry aDocElemTokenMap[] =
 {
     { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS,    XML_TOK_DOC_FONTDECLS       },
     { XML_NAMESPACE_OFFICE, XML_STYLES,             XML_TOK_DOC_STYLES          },
@@ -507,7 +507,7 @@ const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap()
 {
     if(!mpBodyElemTokenMap)
     {
-        static SvXMLTokenMapEntry aBodyElemTokenMap[] =
+        static const SvXMLTokenMapEntry aBodyElemTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,   XML_PAGE,               XML_TOK_BODY_PAGE   },
     { XML_NAMESPACE_PRESENTATION, XML_SETTINGS,     XML_TOK_BODY_SETTINGS   },
@@ -530,7 +530,7 @@ const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap()
 {
     if(!mpStylesElemTokenMap)
     {
-        static SvXMLTokenMapEntry aStylesElemTokenMap[] =
+        static const SvXMLTokenMapEntry aStylesElemTokenMap[] =
 {
     { XML_NAMESPACE_STYLE,  XML_PAGE_LAYOUT,                XML_TOK_STYLES_PAGE_MASTER              },
     { XML_NAMESPACE_STYLE,  XML_PRESENTATION_PAGE_LAYOUT,   XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT },
@@ -550,7 +550,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap()
 {
     if(!mpMasterPageElemTokenMap)
     {
-        static SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
+        static const SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
 {
     { XML_NAMESPACE_STYLE,          XML_STYLE,      XML_TOK_MASTERPAGE_STYLE    },
     { XML_NAMESPACE_PRESENTATION,   XML_NOTES,      XML_TOK_MASTERPAGE_NOTES    },
@@ -569,7 +569,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap()
 {
     if(!mpMasterPageAttrTokenMap)
     {
-        static SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
 {
     { XML_NAMESPACE_STYLE,  XML_NAME,                       XML_TOK_MASTERPAGE_NAME },
     { XML_NAMESPACE_STYLE,  XML_DISPLAY_NAME,               XML_TOK_MASTERPAGE_DISPLAY_NAME },
@@ -594,7 +594,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
 {
     if(!mpPageMasterAttrTokenMap)
     {
-        static SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
 {
     { XML_NAMESPACE_STYLE,          XML_NAME,               XML_TOK_PAGEMASTER_NAME                 },
     XML_TOKEN_MAP_END
@@ -612,7 +612,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
 {
     if(!mpPageMasterStyleAttrTokenMap)
     {
-        static SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
 {
     { XML_NAMESPACE_FO,             XML_MARGIN_TOP,         XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP          },
     { XML_NAMESPACE_FO,             XML_MARGIN_BOTTOM,      XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM       },
@@ -636,7 +636,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap()
 {
     if(!mpDrawPageAttrTokenMap)
     {
-        static SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_NAME,                           XML_TOK_DRAWPAGE_NAME               },
     { XML_NAMESPACE_DRAW,           XML_STYLE_NAME,                     XML_TOK_DRAWPAGE_STYLE_NAME         },
@@ -664,7 +664,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
 {
     if(!mpDrawPageElemTokenMap)
     {
-        static SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
+        static const SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
 {
     { XML_NAMESPACE_PRESENTATION,   XML_NOTES,              XML_TOK_DRAWPAGE_NOTES      },
     { XML_NAMESPACE_ANIMATION,      XML_PAR,                XML_TOK_DRAWPAGE_PAR        },
@@ -684,7 +684,7 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
 {
     if(!mpPresentationPlaceholderAttrTokenMap)
     {
-        static SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
 {
     { XML_NAMESPACE_PRESENTATION,   XML_OBJECT,     XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME  },
     { XML_NAMESPACE_SVG,            XML_X,          XML_TOK_PRESENTATIONPLACEHOLDER_X           },
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index fb411104985a..3e7711c5c0ac 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -247,7 +247,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
 {
     if(!mpGroupShapeElemTokenMap)
     {
-        static SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
+        static const SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_G,              XML_TOK_GROUP_GROUP         },
     { XML_NAMESPACE_DRAW,           XML_RECT,           XML_TOK_GROUP_RECT          },
@@ -287,7 +287,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap()
 {
     if(!mpFrameShapeElemTokenMap)
     {
-        static SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
+        static const SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_TEXT_BOX,       XML_TOK_FRAME_TEXT_BOX      },
     { XML_NAMESPACE_DRAW,           XML_IMAGE,          XML_TOK_FRAME_IMAGE         },
@@ -313,7 +313,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
 {
     if(!mp3DSceneShapeElemTokenMap)
     {
-        static SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
+        static const SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,           XML_SCENE,      XML_TOK_3DSCENE_3DSCENE     },
     { XML_NAMESPACE_DR3D,           XML_CUBE,       XML_TOK_3DSCENE_3DCUBE      },
@@ -336,7 +336,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
 {
     if(!mp3DObjectAttrTokenMap)
     {
-        static SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
+        static const SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW,           XML_STYLE_NAME,         XML_TOK_3DOBJECT_DRAWSTYLE_NAME     },
     { XML_NAMESPACE_DR3D,           XML_TRANSFORM,          XML_TOK_3DOBJECT_TRANSFORM          },
@@ -356,7 +356,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
 {
     if(!mp3DPolygonBasedAttrTokenMap)
     {
-        static SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
+        static const SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
 {
     { XML_NAMESPACE_SVG,            XML_VIEWBOX,            XML_TOK_3DPOLYGONBASED_VIEWBOX      },
     { XML_NAMESPACE_SVG,            XML_D,                  XML_TOK_3DPOLYGONBASED_D            },
@@ -376,7 +376,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
 {
     if(!mp3DCubeObjectAttrTokenMap)
     {
-        static SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
+        static const SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,           XML_MIN_EDGE,           XML_TOK_3DCUBEOBJ_MINEDGE   },
     { XML_NAMESPACE_DR3D,           XML_MAX_EDGE,           XML_TOK_3DCUBEOBJ_MAXEDGE   },
@@ -396,7 +396,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
 {
     if(!mp3DSphereObjectAttrTokenMap)
     {
-        static SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
+        static const SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,           XML_CENTER,             XML_TOK_3DSPHEREOBJ_CENTER  },
     { XML_NAMESPACE_DR3D,           XML_SIZE,               XML_TOK_3DSPHEREOBJ_SIZE    },
@@ -415,7 +415,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
 {
     if(!mp3DLightAttrTokenMap)
     {
-        static SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
+        static const SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
 {
     { XML_NAMESPACE_DR3D,   XML_DIFFUSE_COLOR,      XML_TOK_3DLIGHT_DIFFUSE_COLOR       },
     { XML_NAMESPACE_DR3D,   XML_DIRECTION,          XML_TOK_3DLIGHT_DIRECTION           },
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 7e3b0c84f4df..a9883cdfaf81 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -246,7 +246,7 @@ void SdXMLDrawingPageStyleContext::Finish( sal_Bool bOverwrite )
 void SdXMLDrawingPageStyleContext::FillPropertySet(
     const Reference< beans::XPropertySet > & rPropSet )
 {
-    const sal_uInt16 MAX_SPECIAL_DRAW_STYLES = 7;
+    static const sal_uInt16 MAX_SPECIAL_DRAW_STYLES = 7;
     struct _ContextID_Index_Pair aContextIDs[MAX_SPECIAL_DRAW_STYLES+1] =
     {
         { CTF_DASHNAME , -1 },
@@ -258,7 +258,7 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
         { CTF_FILLBITMAPNAME , -1 },
         { -1, -1 }
     };
-    static sal_uInt16 aFamilies[MAX_SPECIAL_DRAW_STYLES] =
+    static const sal_uInt16 aFamilies[MAX_SPECIAL_DRAW_STYLES] =
     {
         XML_STYLE_FAMILY_SD_STROKE_DASH_ID,
         XML_STYLE_FAMILY_SD_MARKER_ID,
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index ca2834822586..d4eeda78af6f 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -566,12 +566,12 @@ namespace xmloff
         // some string properties
         {
             // the attribute ids of all properties which are expected to be of type string
-            static sal_Int32 nStringPropertyAttributeIds[] =
+            static const sal_Int32 nStringPropertyAttributeIds[] =
             {
                 CCA_LABEL, CCA_TITLE
             };
             // the names of all properties which are expected to be of type string
-            static OUString aStringPropertyNames[] =
+            static const OUString aStringPropertyNames[] =
             {
                 OUString(PROPERTY_LABEL), OUString(PROPERTY_TITLE)
             };
@@ -597,7 +597,7 @@ namespace xmloff
         // --------------------------------------------------------------------
         // some boolean properties
         {
-            static sal_Int32 nBooleanPropertyAttributeIds[] =
+            static const sal_Int32 nBooleanPropertyAttributeIds[] =
             {   // attribute flags
                 CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
             };
@@ -608,14 +608,14 @@ namespace xmloff
                 OUString(PROPERTY_READONLY), OUString(PROPERTY_DEFAULT_STATE),
                 OUString(PROPERTY_TABSTOP), OUString(PROPERTY_ENABLEVISIBLE)
             };
-            static sal_Bool nBooleanPropertyAttrFlags[] =
+            static const sal_Bool nBooleanPropertyAttrFlags[] =
             {   // attribute defaults
                 BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE
             };
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
-            sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
-            sal_Int32 nFlagsCount = sizeof(nBooleanPropertyAttrFlags) / sizeof(nBooleanPropertyAttrFlags[0]);
+            static const sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
+            static const sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
+            static const sal_Int32 nFlagsCount = sizeof(nBooleanPropertyAttrFlags) / sizeof(nBooleanPropertyAttrFlags[0]);
             OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nFlagsCount),
                 "OControlExport::exportCommonControlAttributes: somebody tampered with the maps (2)!");
         #endif
@@ -656,9 +656,9 @@ namespace xmloff
                 exportedProperty(PROPERTY_MAXTEXTLENGTH);
 
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nIdCount = sizeof(nIntegerPropertyAttributeIds) / sizeof(nIntegerPropertyAttributeIds[0]);
-            sal_Int32 nNameCount = sizeof(pIntegerPropertyNames) / sizeof(pIntegerPropertyNames[0]);
-            sal_Int32 nDefaultCount = sizeof(nIntegerPropertyAttrDefaults) / sizeof(nIntegerPropertyAttrDefaults[0]);
+            static const sal_Int32 nIdCount = sizeof(nIntegerPropertyAttributeIds) / sizeof(nIntegerPropertyAttributeIds[0]);
+            static const sal_Int32 nNameCount = sizeof(pIntegerPropertyNames) / sizeof(pIntegerPropertyNames[0]);
+            static const sal_Int32 nDefaultCount = sizeof(nIntegerPropertyAttrDefaults) / sizeof(nIntegerPropertyAttrDefaults[0]);
             OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nDefaultCount),
                 "OControlExport::exportCommonControlAttributes: somebody tampered with the maps (3)!");
         #endif
@@ -1013,9 +1013,9 @@ namespace xmloff
                 OUString(PROPERTY_DEFAULTBUTTON), OUString(PROPERTY_TRISTATE),
                 OUString(PROPERTY_TOGGLE), OUString(PROPERTY_FOCUS_ON_CLICK)
             };
-            sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
+            static const sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
+            static const sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
             OSL_ENSURE((nIdCount == nNameCount),
                 "OControlExport::exportSpecialAttributes: somebody tampered with the maps (1)!");
         #endif
@@ -1053,12 +1053,12 @@ namespace xmloff
                 10
             };
 
-            sal_Int32 nIdCount = sizeof( nIntegerPropertyAttributeIds ) / sizeof( nIntegerPropertyAttributeIds[0] );
+            static const sal_Int32 nIdCount = sizeof( nIntegerPropertyAttributeIds ) / sizeof( nIntegerPropertyAttributeIds[0] );
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nNameCount = sizeof( pIntegerPropertyNames ) / sizeof( pIntegerPropertyNames[0] );
+            static const sal_Int32 nNameCount = sizeof( pIntegerPropertyNames ) / sizeof( pIntegerPropertyNames[0] );
             OSL_ENSURE( ( nIdCount == nNameCount ),
                 "OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
-            sal_Int32 nDefaultCount = sizeof( nIntegerPropertyAttrDefaults ) / sizeof( nIntegerPropertyAttrDefaults[0] );
+            static const sal_Int32 nDefaultCount = sizeof( nIntegerPropertyAttrDefaults ) / sizeof( nIntegerPropertyAttrDefaults[0] );
             OSL_ENSURE( ( nIdCount == nDefaultCount ),
                 "OControlExport::exportSpecialAttributes: somebody tampered with the maps (3)!" );
         #endif
@@ -1195,7 +1195,7 @@ namespace xmloff
         // ----------------------------------
         // the string properties
         {
-            static sal_Int32 nStringPropertyAttributeIds[] =
+            static const sal_Int32 nStringPropertyAttributeIds[] =
             {   // attribute flags
                 SCA_GROUP_NAME
             };
@@ -1204,9 +1204,9 @@ namespace xmloff
                 OUString(PROPERTY_GROUP_NAME)
             };
 
-            sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
+            static const sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] );
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
+            static const sal_Int32 nNameCount = sizeof( pStringPropertyNames ) / sizeof( pStringPropertyNames[0] );
             OSL_ENSURE( ( nIdCount == nNameCount ),
                 "OControlExport::exportSpecialAttributes: somebody tampered with the maps (2)!" );
         #endif
@@ -2160,17 +2160,17 @@ namespace xmloff
         // ---------------------
         // the string properties
         {
-            static FormAttributes eStringPropertyIds[] =
+            static const FormAttributes eStringPropertyIds[] =
             {
                 faName, /*faAction,*/ faCommand, faFilter, faOrder
             };
-            static OUString aStringPropertyNames[] =
+            static const OUString aStringPropertyNames[] =
             {
                 OUString(PROPERTY_NAME), /*OUString(PROPERTY_TARGETURL),*/ OUString(PROPERTY_COMMAND), OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER)
             };
-            sal_Int32 nIdCount = sizeof(eStringPropertyIds) / sizeof(eStringPropertyIds[0]);
+            static const sal_Int32 nIdCount = sizeof(eStringPropertyIds) / sizeof(eStringPropertyIds[0]);
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nNameCount = sizeof(aStringPropertyNames) / sizeof(aStringPropertyNames[0]);
+            static const sal_Int32 nNameCount = sizeof(aStringPropertyNames) / sizeof(aStringPropertyNames[0]);
             OSL_ENSURE((nIdCount == nNameCount),
                 "OFormExport::exportAttributes: somebody tampered with the maps (1)!");
         #endif
@@ -2204,7 +2204,7 @@ namespace xmloff
 
         // the boolean properties
         {
-            static FormAttributes eBooleanPropertyIds[] =
+            static const FormAttributes eBooleanPropertyIds[] =
             {
                 faAllowDeletes, faAllowInserts, faAllowUpdates, faApplyFilter, faEscapeProcessing, faIgnoreResult
             };
@@ -2217,14 +2217,14 @@ namespace xmloff
                 OUString(PROPERTY_ESCAPEPROCESSING),
                 OUString(PROPERTY_IGNORERESULT)
             };
-            static sal_Int8 nBooleanPropertyAttrFlags[] =
+            static const sal_Int8 nBooleanPropertyAttrFlags[] =
             {
                 BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE
             };
-            sal_Int32 nIdCount = sizeof(eBooleanPropertyIds) / sizeof(eBooleanPropertyIds[0]);
+            static const sal_Int32 nIdCount = sizeof(eBooleanPropertyIds) / sizeof(eBooleanPropertyIds[0]);
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
-            sal_Int32 nFlagsCount = sizeof(nBooleanPropertyAttrFlags) / sizeof(nBooleanPropertyAttrFlags[0]);
+            static const sal_Int32 nNameCount = sizeof(pBooleanPropertyNames) / sizeof(pBooleanPropertyNames[0]);
+            static const sal_Int32 nFlagsCount = sizeof(nBooleanPropertyAttrFlags) / sizeof(nBooleanPropertyAttrFlags[0]);
             OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nFlagsCount),
                 "OFormExport::exportAttributes: somebody tampered with the maps (2)!");
         #endif
@@ -2239,7 +2239,7 @@ namespace xmloff
 
         // the enum properties
         {
-            static FormAttributes eEnumPropertyIds[] =
+            static const FormAttributes eEnumPropertyIds[] =
             {
                 faEnctype, faMethod, faCommandType, faNavigationMode, faTabbingCycle
             };
@@ -2247,24 +2247,24 @@ namespace xmloff
             {
                 OUString(PROPERTY_SUBMIT_ENCODING), OUString(PROPERTY_SUBMIT_METHOD), OUString(PROPERTY_COMMAND_TYPE), OUString(PROPERTY_NAVIGATION), OUString(PROPERTY_CYCLE)
             };
-            static OEnumMapper::EnumProperties eEnumPropertyMaps[] =
+            static const OEnumMapper::EnumProperties eEnumPropertyMaps[] =
             {
                 OEnumMapper::epSubmitEncoding, OEnumMapper::epSubmitMethod, OEnumMapper::epCommandType, OEnumMapper::epNavigationType, OEnumMapper::epTabCyle
             };
-            static sal_Int32 nEnumPropertyAttrDefaults[] =
+            static const sal_Int32 nEnumPropertyAttrDefaults[] =
             {
                 FormSubmitEncoding_URL, FormSubmitMethod_GET, CommandType::COMMAND, NavigationBarMode_CURRENT, TabulatorCycle_RECORDS
             };
-            static sal_Bool nEnumPropertyAttrDefaultFlags[] =
+            static const sal_Bool nEnumPropertyAttrDefaultFlags[] =
             {
                 sal_False, sal_False, sal_False, sal_False, sal_True
             };
-            sal_Int32 nIdCount = sizeof(eEnumPropertyIds) / sizeof(eEnumPropertyIds[0]);
+            static const sal_Int32 nIdCount = sizeof(eEnumPropertyIds) / sizeof(eEnumPropertyIds[0]);
         #if OSL_DEBUG_LEVEL > 0
-            sal_Int32 nNameCount = sizeof(pEnumPropertyNames) / sizeof(pEnumPropertyNames[0]);
-            sal_Int32 nDefaultCount = sizeof(nEnumPropertyAttrDefaults) / sizeof(nEnumPropertyAttrDefaults[0]);
-            sal_Int32 nDefaultFlagCount = sizeof(nEnumPropertyAttrDefaultFlags) / sizeof(nEnumPropertyAttrDefaultFlags[0]);
-            sal_Int32 nMapCount = sizeof(eEnumPropertyMaps) / sizeof(eEnumPropertyMaps[0]);
+            static const sal_Int32 nNameCount = sizeof(pEnumPropertyNames) / sizeof(pEnumPropertyNames[0]);
+            static const sal_Int32 nDefaultCount = sizeof(nEnumPropertyAttrDefaults) / sizeof(nEnumPropertyAttrDefaults[0]);
+            static const sal_Int32 nDefaultFlagCount = sizeof(nEnumPropertyAttrDefaultFlags) / sizeof(nEnumPropertyAttrDefaultFlags[0]);
+            static const sal_Int32 nMapCount = sizeof(eEnumPropertyMaps) / sizeof(eEnumPropertyMaps[0]);
             OSL_ENSURE((nIdCount == nNameCount) && (nNameCount == nDefaultCount) && (nDefaultCount == nDefaultFlagCount) && (nDefaultFlagCount == nMapCount),
                 "OFormExport::exportAttributes: somebody tampered with the maps (3)!");
         #endif
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index 84b15ab61804..58c9b2842025 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -80,7 +80,7 @@ namespace xmloff
                 // FormSubmitEncoding
                 case epSubmitEncoding:
                 {
-                    static SvXMLEnumMapEntry aSubmitEncodingMap[] =
+                    static const SvXMLEnumMapEntry aSubmitEncodingMap[] =
                     {
                         { XML_APPLICATION_X_WWW_FORM_URLENCODED, FormSubmitEncoding_URL },
                         { XML_MULTIPART_FORMDATA, FormSubmitEncoding_MULTIPART },
@@ -93,7 +93,7 @@ namespace xmloff
                 // FormSubmitMethod
                 case epSubmitMethod:
                 {
-                    static SvXMLEnumMapEntry aSubmitMethodMap[] =
+                    static const SvXMLEnumMapEntry aSubmitMethodMap[] =
                     {
                         { XML_GET, FormSubmitMethod_GET },
                         { XML_POST, FormSubmitMethod_POST },
@@ -105,7 +105,7 @@ namespace xmloff
                 // CommandType
                 case epCommandType:
                 {
-                    static SvXMLEnumMapEntry aCommandTypeMap[] =
+                    static const SvXMLEnumMapEntry aCommandTypeMap[] =
                     {
                         { XML_TABLE, CommandType::TABLE },
                         { XML_QUERY, CommandType::QUERY },
@@ -118,7 +118,7 @@ namespace xmloff
                 // NavigationBarMode
                 case epNavigationType:
                 {
-                    static SvXMLEnumMapEntry aNavigationTypeMap[] =
+                    static const SvXMLEnumMapEntry aNavigationTypeMap[] =
                     {
                         { XML_NONE, NavigationBarMode_NONE },
                         { XML_CURRENT, NavigationBarMode_CURRENT },
@@ -131,7 +131,7 @@ namespace xmloff
                 // TabulatorCycle
                 case epTabCyle:
                 {
-                    static SvXMLEnumMapEntry aTabulytorCycleMap[] =
+                    static const SvXMLEnumMapEntry aTabulytorCycleMap[] =
                     {
                         { XML_RECORDS, TabulatorCycle_RECORDS },
                         { XML_CURRENT, TabulatorCycle_CURRENT },
@@ -144,7 +144,7 @@ namespace xmloff
                 // FormButtonType
                 case epButtonType:
                 {
-                    static SvXMLEnumMapEntry aFormButtonTypeMap[] =
+                    static const SvXMLEnumMapEntry aFormButtonTypeMap[] =
                     {
                         { XML_PUSH, FormButtonType_PUSH },
                         { XML_SUBMIT, FormButtonType_SUBMIT },
@@ -158,7 +158,7 @@ namespace xmloff
                 // ListSourceType
                 case epListSourceType:
                 {
-                    static SvXMLEnumMapEntry aListSourceTypeMap[] =
+                    static const SvXMLEnumMapEntry aListSourceTypeMap[] =
                     {
                         { XML_VALUE_LIST, ListSourceType_VALUELIST },
                         { XML_TABLE, ListSourceType_TABLE },
@@ -174,7 +174,7 @@ namespace xmloff
                 // check state of a checkbox
                 case epCheckState:
                 {
-                    static SvXMLEnumMapEntry aCheckStateMap[] =
+                    static const SvXMLEnumMapEntry aCheckStateMap[] =
                     {
                         { XML_UNCHECKED, STATE_NOCHECK },
                         { XML_CHECKED, STATE_CHECK },
@@ -186,7 +186,7 @@ namespace xmloff
                 break;
                 case epTextAlign:
                 {
-                    static SvXMLEnumMapEntry aTextAlignMap[] =
+                    static const SvXMLEnumMapEntry aTextAlignMap[] =
                     {
                         { XML_START,        awt::TextAlign::LEFT },
                         { XML_CENTER,       awt::TextAlign::CENTER },
@@ -200,7 +200,7 @@ namespace xmloff
                 break;
                 case epBorderWidth:
                 {
-                    static SvXMLEnumMapEntry aBorderTypeMap[] =
+                    static const SvXMLEnumMapEntry aBorderTypeMap[] =
                     {
                         { XML_NONE,     0 },
                         { XML_HIDDEN,   0 },
@@ -220,7 +220,7 @@ namespace xmloff
 
                 case epFontEmphasis:
                 {
-                    static SvXMLEnumMapEntry aFontEmphasisMap[] =
+                    static const SvXMLEnumMapEntry aFontEmphasisMap[] =
                     {
                         { XML_NONE,     awt::FontEmphasisMark::NONE },
                         { XML_DOT,      awt::FontEmphasisMark::DOT },
@@ -235,7 +235,7 @@ namespace xmloff
 
                 case epFontRelief:
                 {
-                    static SvXMLEnumMapEntry aFontReliefMap[] =
+                    static const SvXMLEnumMapEntry aFontReliefMap[] =
                     {
                         { XML_NONE,     FontRelief::NONE },
                         { XML_ENGRAVED, FontRelief::ENGRAVED },
@@ -248,7 +248,7 @@ namespace xmloff
 
                 case epListLinkageType:
                 {
-                    static SvXMLEnumMapEntry aListLinkageMap[] =
+                    static const SvXMLEnumMapEntry aListLinkageMap[] =
                     {
                         { XML_SELECTION,            0 },
                         { XML_SELECTION_INDEXES,    1 },
@@ -260,7 +260,7 @@ namespace xmloff
 
                 case epOrientation:
                 {
-                    static SvXMLEnumMapEntry aOrientationMap[] =
+                    static const SvXMLEnumMapEntry aOrientationMap[] =
                     {
                         { XML_HORIZONTAL,   ScrollBarOrientation::HORIZONTAL },
                         { XML_VERTICAL,     ScrollBarOrientation::VERTICAL },
@@ -272,7 +272,7 @@ namespace xmloff
 
                 case epVisualEffect:
                 {
-                    static SvXMLEnumMapEntry aVisualEffectMap[] =
+                    static const SvXMLEnumMapEntry aVisualEffectMap[] =
                     {
                         { XML_NONE, VisualEffect::NONE },
                         { XML_3D,   VisualEffect::LOOK3D },
@@ -285,7 +285,7 @@ namespace xmloff
 
                 case epImagePosition:
                 {
-                    static SvXMLEnumMapEntry aImagePositionMap[] =
+                    static const SvXMLEnumMapEntry aImagePositionMap[] =
                     {
                         { XML_START,  0 },
                         { XML_END,    1 },
@@ -300,7 +300,7 @@ namespace xmloff
 
                 case epImageAlign:
                 {
-                    static SvXMLEnumMapEntry aImageAlignMap[] =
+                    static const SvXMLEnumMapEntry aImageAlignMap[] =
                     {
                         { XML_START,  0 },
                         { XML_CENTER, 1 },
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index bc200d8ef6a2..435040f756ea 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -104,7 +104,7 @@ sal_Bool XMLGradientStyleImport::importXML(
     aGradient.Border = 0;
 
     {
-        static SvXMLTokenMapEntry aGradientAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aGradientAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
     { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 5d852c952d9d..c42e6a3db026 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -93,7 +93,7 @@ sal_Bool XMLHatchStyleImport::importXML(
     aHatch.Angle = 0;
 
     {
-        static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME },
     { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_HATCH_DISPLAY_NAME },
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index de3bfc8f3e8f..df8dd0ab7dde 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -119,7 +119,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
     OUString aDisplayName;
 
     {
-        static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aHatchAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME },
     { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME },
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 41ab751b8b28..93a66e8dd77d 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -100,7 +100,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
     aGradient.Border = 0;
 
     {
-        static SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
+        static const SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
 {
     { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
     { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index aba949681f76..7f63244ad23e 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -54,7 +54,7 @@ enum SvXMLTokenMapAttrs
 };
 static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
 {
-    static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
+    static const SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
     {
         { XML_NAMESPACE_XLINK, XML_HREF,        XML_TOK_BGIMG_HREF      },
         { XML_NAMESPACE_XLINK, XML_TYPE,        XML_TOK_BGIMG_TYPE      },
@@ -71,14 +71,14 @@ static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
 
 
 
-static SvXMLEnumMapEntry psXML_BrushHoriPos[] =
+static const SvXMLEnumMapEntry psXML_BrushHoriPos[] =
 {
     { XML_LEFT,         GraphicLocation_LEFT_MIDDLE },
     { XML_RIGHT,        GraphicLocation_RIGHT_MIDDLE    },
     { XML_TOKEN_INVALID,                    0           }
 };
 
-static SvXMLEnumMapEntry psXML_BrushVertPos[] =
+static const SvXMLEnumMapEntry psXML_BrushVertPos[] =
 {
     { XML_TOP,          GraphicLocation_MIDDLE_TOP  },
     { XML_BOTTOM,       GraphicLocation_MIDDLE_BOTTOM   },
@@ -287,7 +287,7 @@ void XMLBackgroundImageContext::ProcessAttrs(
         case XML_TOK_BGIMG_REPEAT:
             {
                 sal_uInt16 nPos = GraphicLocation_NONE;
-                static SvXMLEnumMapEntry psXML_BrushRepeat[] =
+                static const SvXMLEnumMapEntry psXML_BrushRepeat[] =
                 {
                     { XML_BACKGROUND_REPEAT,        GraphicLocation_TILED   },
                     { XML_BACKGROUND_NO_REPEAT,     GraphicLocation_MIDDLE_MIDDLE       },
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 4887f013940e..95b4a86f7f4b 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -61,7 +61,7 @@ enum XMLFontStyleAttrTokens
 
 static const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
 {
-    static SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
+    static const SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
     {
         { XML_NAMESPACE_SVG, XML_FONT_FAMILY,
                 XML_TOK_FONT_STYLE_ATTR_FAMILY },
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5d7a98cab75e..32ca705884f9 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -309,7 +309,7 @@ enum SvXMLStyleElemAttrTokens
 
 #define XML_NUMF_COLORCOUNT     10
 
-static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
+static const ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
 {
     COL_BLACK,
     COL_LIGHTBLUE,
@@ -329,14 +329,14 @@ static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
 
 // maps for SvXMLUnitConverter::convertEnum
 
-static SvXMLEnumMapEntry aStyleValueMap[] =
+static const SvXMLEnumMapEntry aStyleValueMap[] =
 {
     { XML_SHORT,            sal_False   },
     { XML_LONG,             sal_True    },
     { XML_TOKEN_INVALID,    0 }
 };
 
-static SvXMLEnumMapEntry aFormatSourceMap[] =
+static const SvXMLEnumMapEntry aFormatSourceMap[] =
 {
     { XML_FIXED,            sal_False },
     { XML_LANGUAGE,         sal_True  },
@@ -358,7 +358,7 @@ struct SvXMLDefaultDateFormat
     sal_Bool                    bSystem;
 };
 
-static SvXMLDefaultDateFormat aDefaultDateFormats[] =
+static const SvXMLDefaultDateFormat aDefaultDateFormats[] =
 {
     // format                           day-of-week     day             month               year            hours           minutes         seconds         format-source
 
@@ -490,7 +490,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStylesElemTokenMap()
 {
     if( !pStylesElemTokenMap )
     {
-        static SvXMLTokenMapEntry aStylesElemMap[] =
+        static const SvXMLTokenMapEntry aStylesElemMap[] =
         {
             //  style elements
             { XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE,      XML_TOK_STYLES_NUMBER_STYLE      },
@@ -512,7 +512,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap()
 {
     if( !pStyleElemTokenMap )
     {
-        static SvXMLTokenMapEntry aStyleElemMap[] =
+        static const SvXMLTokenMapEntry aStyleElemMap[] =
         {
             //  elements in a style
             { XML_NAMESPACE_NUMBER, XML_TEXT,               XML_TOK_STYLE_TEXT              },
@@ -548,7 +548,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleAttrTokenMap()
 {
     if( !pStyleAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aStyleAttrMap[] =
+        static const SvXMLTokenMapEntry aStyleAttrMap[] =
         {
             //  attributes for a style
             { XML_NAMESPACE_STYLE,  XML_NAME,                  XML_TOK_STYLE_ATTR_NAME                  },
@@ -579,7 +579,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap()
 {
     if( !pStyleElemAttrTokenMap )
     {
-        static SvXMLTokenMapEntry aStyleElemAttrMap[] =
+        static const SvXMLTokenMapEntry aStyleElemAttrMap[] =
         {
             //  attributes for an element within a style
             { XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,          XML_TOK_ELEM_ATTR_DECIMAL_PLACES       },
@@ -1267,7 +1267,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes
                 SvXMLDateElementAttributes eMins, SvXMLDateElementAttributes eSecs,
                 sal_Bool bSystem )
 {
-    const sal_uInt16 nCount = sizeof(aDefaultDateFormats) / sizeof(SvXMLDefaultDateFormat);
+    static const sal_uInt16 nCount = sizeof(aDefaultDateFormats) / sizeof(SvXMLDefaultDateFormat);
     for (sal_uInt16 nPos=0; nPos<nCount; nPos++)
     {
         const SvXMLDefaultDateFormat& rEntry = aDefaultDateFormats[nPos];
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index b4ac805eda1e..88b65a18d4bf 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -126,7 +126,7 @@ enum SvxXMLTextListLevelStyleAttrTokens
 
 static const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap()
 {
-    static SvXMLTokenMapEntry aLevelAttrTokenMap[] =
+    static const SvXMLTokenMapEntry aLevelAttrTokenMap[] =
     {
         { XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_LEVEL_ATTR_LEVEL },
         { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME },
@@ -626,7 +626,7 @@ enum SvxXMLStyleAttributesAttrTokens
 };
 static const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
 {
-    static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
+    static const SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
     {
         { XML_NAMESPACE_TEXT, XML_SPACE_BEFORE,
                 XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE },
@@ -949,7 +949,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens
 };
 static const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap()
 {
-    static SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
+    static const SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
     {
         { XML_NAMESPACE_TEXT, XML_LABEL_FOLLOWED_BY,
                 XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY },
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 1c5b7f0afed5..f5685e8aa1ea 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -503,7 +503,7 @@ void XMLTableExport::exportAutoStyles()
 
 const TableStyleElement* getTableStyleMap()
 {
-    static struct TableStyleElement gTableStyleElements[] =
+    static const struct TableStyleElement gTableStyleElements[] =
     {
         { XML_FIRST_ROW, OUString("first-row") },
         { XML_LAST_ROW, OUString("last-row") },
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index b6cd75e719c1..a674d6091449 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -81,7 +81,7 @@ XMLLineNumberingImportContext::~XMLLineNumberingImportContext()
 void XMLLineNumberingImportContext::StartElement(
     const Reference<XAttributeList> & xAttrList)
 {
-    static SvXMLTokenMapEntry aLineNumberingTokenMap[] =
+    static const SvXMLTokenMapEntry aLineNumberingTokenMap[] =
     {
         { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_LINENUMBERING_STYLE_NAME },
         { XML_NAMESPACE_TEXT, XML_NUMBER_LINES,
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 136f20575e5e..b24665eac9e7 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1009,7 +1009,7 @@ sal_Bool XMLTransformerBase::ReplaceInWithInch( OUString& rValue )
 
 sal_Bool XMLTransformerBase::EncodeStyleName( OUString& rName ) const
 {
-    static sal_Char aHexTab[] = "0123456789abcdef";
+    static const sal_Char aHexTab[] = "0123456789abcdef";
 
     sal_Bool bEncoded = sal_False;