Mark as static and/or const

Change-Id: I45a890bb793a6d92546c05bd75738d4dd753a01e

6 files changed, 44 insertions, 44 deletions

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,