loplugin:staticvar in xmloff

Change-Id: I283d162807a906334627613be7c340af566144f1
Reviewed-on: https://gerrit.libreoffice.org/61921
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

22 files changed, 196 insertions, 210 deletions

diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index 258a921ae1c6..4cba6e41fc16 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -105,7 +105,7 @@ void Test::testMetaGenerator()
         comphelper::GenericPropertySet_CreateInstance(
             new comphelper::PropertySetInfo(aInfoMap)));
 
-    struct {
+    static struct {
         char const*const generator;
         char const*const buildId;
         sal_uInt16 const result;
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 9ca9b7aed308..91040c31e8b7 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -38,21 +38,22 @@ namespace xmloff
 #define MAP_CONST_P( name, prefix, token, type, context ){ name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010, false }
 #define MAP_END()   { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
 
-    static XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
+    static XMLPropertyMapEntry const aControlStyleProperties[] =
     {
-        static XMLPropertyMapEntry aControlStyleProperties[] =
-        {
+            MAP_CONST_P( PROPERTY_ALIGN,        XML_NAMESPACE_FO,       XML_TEXT_ALIGN,             XML_TYPE_TEXT_ALIGN, 0 ),
             MAP_CONST( PROPERTY_BACKGROUNDCOLOR, XML_NAMESPACE_FO,      XML_BACKGROUND_COLOR,       XML_TYPE_COLOR, 0 ),
-            MAP_CONST_P( PROPERTY_ALIGN,          XML_NAMESPACE_FO,       XML_TEXT_ALIGN,             XML_TYPE_TEXT_ALIGN, 0 ),
             MAP_CONST( PROPERTY_BORDER,         XML_NAMESPACE_FO,       XML_BORDER,                 XML_TYPE_CONTROL_BORDER|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
+            MAP_ASCII( "BorderColor",           XML_NAMESPACE_FO,       XML_BORDER,                 XML_TYPE_CONTROL_BORDER_COLOR|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
             MAP_ASCII( "FontCharWidth",         XML_NAMESPACE_STYLE,    XML_FONT_CHAR_WIDTH,        XML_TYPE_NUMBER16, 0 ),
             MAP_ASCII( "FontCharset",           XML_NAMESPACE_STYLE,    XML_FONT_CHARSET,           XML_TYPE_TEXT_FONTENCODING, 0 ),
+            MAP_ASCII( "FontEmphasisMark",      XML_NAMESPACE_STYLE,    XML_TEXT_EMPHASIZE,         XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
             MAP_ASCII( "FontFamily",            XML_NAMESPACE_STYLE,    XML_FONT_FAMILY_GENERIC,    XML_TYPE_TEXT_FONTFAMILY, 0 ),
             MAP_ASCII( "FontHeight",            XML_NAMESPACE_FO,       XML_FONT_SIZE,              XML_TYPE_CHAR_HEIGHT, 0 ),
             MAP_ASCII( "FontKerning",           XML_NAMESPACE_STYLE,    XML_LETTER_KERNING,         XML_TYPE_BOOL, 0 ),
             MAP_ASCII( "FontName",              XML_NAMESPACE_STYLE,    XML_FONT_NAME,              XML_TYPE_STRING, 0 ),
             MAP_ASCII( "FontOrientation",       XML_NAMESPACE_STYLE,    XML_ROTATION_ANGLE,         XML_TYPE_ROTATION_ANGLE, 0 ),
             MAP_ASCII( "FontPitch",             XML_NAMESPACE_STYLE,    XML_FONT_PITCH,             XML_TYPE_TEXT_FONTPITCH, 0 ),
+            MAP_ASCII( "FontRelief",            XML_NAMESPACE_STYLE,    XML_FONT_RELIEF,            XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
             MAP_ASCII( "FontSlant",             XML_NAMESPACE_FO,       XML_FONT_STYLE,             XML_TYPE_TEXT_POSTURE, 0 ),
 
             MAP_ASCII( "FontStrikeout",         XML_NAMESPACE_STYLE,    XML_TEXT_LINE_THROUGH_STYLE,    XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
@@ -67,39 +68,18 @@ namespace xmloff
             MAP_ASCII( "FontWeight",            XML_NAMESPACE_FO,       XML_FONT_WEIGHT,            XML_TYPE_TEXT_WEIGHT, 0 ),
             MAP_ASCII( "FontWidth",             XML_NAMESPACE_STYLE,    XML_FONT_WIDTH,             XML_TYPE_FONT_WIDTH, 0 ),
             MAP_ASCII( "FontWordLineMode",      XML_NAMESPACE_FO,       XML_SCORE_SPACES,           XML_TYPE_NBOOL, 0 ),
+
+            MAP_CONST( PROPERTY_FORMATKEY,      XML_NAMESPACE_STYLE,    XML_DATA_STYLE_NAME,        XML_TYPE_STRING | MID_FLAG_NO_PROPERTY_EXPORT | MID_FLAG_SPECIAL_ITEM, CTF_FORMS_DATA_STYLE ),
+
             MAP_ASCII( "SymbolColor",           XML_NAMESPACE_STYLE,    XML_COLOR,                  XML_TYPE_COLOR, 0 ),
-            MAP_ASCII( "BorderColor",           XML_NAMESPACE_FO,       XML_BORDER,                 XML_TYPE_CONTROL_BORDER_COLOR|MID_FLAG_MULTI_PROPERTY|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
             MAP_ASCII( "TextColor",             XML_NAMESPACE_FO,       XML_COLOR,                  XML_TYPE_COLOR, 0 ),
-            MAP_CONST( PROPERTY_FORMATKEY,      XML_NAMESPACE_STYLE,    XML_DATA_STYLE_NAME,        XML_TYPE_STRING | MID_FLAG_NO_PROPERTY_EXPORT | MID_FLAG_SPECIAL_ITEM, CTF_FORMS_DATA_STYLE ),
-            MAP_ASCII( "FontEmphasisMark",      XML_NAMESPACE_STYLE,    XML_TEXT_EMPHASIZE,         XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
-            MAP_ASCII( "FontRelief",            XML_NAMESPACE_STYLE,    XML_FONT_RELIEF,            XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
             MAP_ASCII( "TextLineColor",         XML_NAMESPACE_STYLE,    XML_TEXT_UNDERLINE_COLOR,   XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
             MAP_END()
-        };
-
-        return aControlStyleProperties;
-    }
-
-    const XMLPropertyMapEntry* getControlStylePropertyMap( )
-    {
-        return getControlStylePropertyMap_Access();
-    }
-
-    struct XMLPropertyMapEntryLess
-    {
-        bool operator()(const XMLPropertyMapEntry& _rLeft, const XMLPropertyMapEntry& _rRight)
-        {
-            return strcmp(_rLeft.msApiName, _rRight.msApiName) < 0;
-        }
     };
 
-    static void implSortMap(XMLPropertyMapEntry* _pMap)
+    const XMLPropertyMapEntry* getControlStylePropertyMap( )
     {
-        XMLPropertyMapEntry* pEnd;
-        // determine the last element
-        for ( pEnd = _pMap; pEnd->msApiName; ++pEnd)
-            ;
-        ::std::sort(_pMap, pEnd, XMLPropertyMapEntryLess());
+        return aControlStyleProperties;
     }
 
     void initializePropertyMaps()
@@ -107,7 +87,13 @@ namespace xmloff
         static bool bSorted = false;
         if (!bSorted)
         {
-            implSortMap(getControlStylePropertyMap_Access());
+            XMLPropertyMapEntry const * pEnd;
+            // determine the last element
+            for ( pEnd = aControlStyleProperties; pEnd->msApiName; ++pEnd)
+                ;
+            assert( ::std::is_sorted(aControlStyleProperties, pEnd,
+                                    [&](const XMLPropertyMapEntry& _rLeft, const XMLPropertyMapEntry& _rRight)
+                                    { return strcmp(_rLeft.msApiName, _rRight.msApiName) < 0; }) );
             bSorted = true;
         }
     }
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index d794d955b8d5..707e5dfca336 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -57,12 +57,12 @@ namespace xmloff
             return -1;
         }
 
-        struct AlignmentTranslationEntry
+        static struct AlignmentTranslationEntry
         {
             ParagraphAdjust const nParagraphValue;
             sal_Int16 const       nControlValue;
         }
-        AlignmentTranslations[] =
+        const AlignmentTranslations[] =
         {
             // note that order matters:
             // valueAlignToParaAdjust and valueParaAdjustToAlign search this map from the _beginning_
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 471cf629335c..4f8292ed26dd 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -62,7 +62,7 @@ const sal_uInt16 MAX_PROP_TYPES =
     (XML_TYPE_PROP_END >> XML_TYPE_PROP_SHIFT) -
     (XML_TYPE_PROP_START >> XML_TYPE_PROP_SHIFT);
 
-XMLPropTokens_Impl aPropTokens[MAX_PROP_TYPES] =
+XMLPropTokens_Impl const aPropTokens[MAX_PROP_TYPES] =
 {
     ENTRY(CHART),
     ENTRY(GRAPHIC),
diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index c7236ab6ed2b..c6966ae255a1 100644
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -21,7 +21,7 @@
 #include <xmloff/xmlnmspe.hxx>
 
 
-XMLTransformerEventMapEntry aTransformerEventMap[] =
+XMLTransformerEventMapEntry const aTransformerEventMap[] =
 {
     { XML_NAMESPACE_DOM,    "select",   "on-select" },
     { XML_NAMESPACE_OFFICE, "insert-start", "on-insert-start" },
@@ -92,7 +92,7 @@ XMLTransformerEventMapEntry aTransformerEventMap[] =
     { 0, nullptr, nullptr }
 };
 
-XMLTransformerEventMapEntry aFormTransformerEventMap[] =
+XMLTransformerEventMapEntry const aFormTransformerEventMap[] =
 {
     { XML_NAMESPACE_DOM,    "mouseover",    "on-mouseover" },
     { XML_NAMESPACE_DOM,    "mouseout", "on-mouseout" },
diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index ec8d1a92f406..c615439d7550 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -29,8 +29,8 @@ struct XMLTransformerEventMapEntry
     const sal_Char *m_pOOoName;
 };
 
-extern XMLTransformerEventMapEntry aTransformerEventMap[];
-extern XMLTransformerEventMapEntry aFormTransformerEventMap[];
+extern XMLTransformerEventMapEntry const aTransformerEventMap[];
+extern XMLTransformerEventMapEntry const aFormTransformerEventMap[];
 
 #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTMAP_HXX
 
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 5fd369f621e5..f44b73398c1a 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -44,10 +44,10 @@ class XMLTransformerOASISEventMap_Impl:
                             NameHash_Impl, NameHash_Impl >
 {
 public:
-    explicit XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry *pInit );
+    explicit XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry const *pInit );
 };
 
-XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry *pInit )
+XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry const *pInit )
 {
     if( pInit )
     {
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index bc9b70b3019f..12a4fd3265c8 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -39,13 +39,13 @@ class XMLTransformerOOoEventMap_Impl:
 {
 public:
 
-    void AddMap( XMLTransformerEventMapEntry *pInit );
+    void AddMap( XMLTransformerEventMapEntry const *pInit );
 
-    XMLTransformerOOoEventMap_Impl( XMLTransformerEventMapEntry *pInit,
-                                       XMLTransformerEventMapEntry *pInit2  );
+    XMLTransformerOOoEventMap_Impl( XMLTransformerEventMapEntry const *pInit,
+                                       XMLTransformerEventMapEntry const *pInit2  );
 };
 
-void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
+void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry const *pInit )
 {
     XMLTransformerOOoEventMap_Impl::key_type aKey;
     XMLTransformerOOoEventMap_Impl::mapped_type aData;
@@ -70,8 +70,8 @@ void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit
 }
 
 XMLTransformerOOoEventMap_Impl::XMLTransformerOOoEventMap_Impl(
-        XMLTransformerEventMapEntry *pInit,
-        XMLTransformerEventMapEntry *pInit2 )
+        XMLTransformerEventMapEntry const *pInit,
+        XMLTransformerEventMapEntry const *pInit2 )
 {
     if( pInit )
         AddMap( pInit );
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 26482ab78e6e..9d0a361a3ca0 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -93,7 +93,7 @@ enum XMLUserDefinedTransformerAction
 #define RENAME_ENTRY( f, s ) \
     (static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16))
 
-static XMLTransformerActionInit aActionTable[] =
+static XMLTransformerActionInit const aActionTable[] =
 {
     // remove office:class from <office:document> and <office:document-content>
     ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ),
@@ -570,7 +570,7 @@ static XMLTransformerActionInit aActionTable[] =
 };
 
 // XML_ETACTION_STYLE
-static XMLTransformerActionInit aStyleActionTable[] =
+static XMLTransformerActionInit const aStyleActionTable[] =
 {
     ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ),
     ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ),
@@ -592,7 +592,7 @@ static XMLTransformerActionInit aStyleActionTable[] =
 };
 
 // OOO_FRAME_ELEM_ACTIONS
-static XMLTransformerActionInit aFrameElemActionTable[] =
+static XMLTransformerActionInit const aFrameElemActionTable[] =
 {
     ENTRY1Q( OFFICE, EVENTS, XML_ETACTION_RENAME_ELEM,
                       XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ),
@@ -605,7 +605,7 @@ static XMLTransformerActionInit aFrameElemActionTable[] =
 };
 
 // OOO_FRAME_ATTR_ACTIONS
-static XMLTransformerActionInit aFrameAttrActionTable[] =
+static XMLTransformerActionInit const aFrameAttrActionTable[] =
 {
     ENTRY0( DRAW, ZINDEX, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
     ENTRY0( DRAW, ID, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
@@ -634,7 +634,7 @@ static XMLTransformerActionInit aFrameAttrActionTable[] =
 };
 
 // OOO_EVENT_ELEM_ACTIONS
-static XMLTransformerActionInit aEventActionTable[] =
+static XMLTransformerActionInit const aEventActionTable[] =
 {
     ENTRY0( XLINK, HREF, XML_ATACTION_HREF ),
     ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX,
@@ -647,7 +647,7 @@ static XMLTransformerActionInit aEventActionTable[] =
 };
 
 // action table for OOO_MASTER_PAGE_ACTIONS
-static XMLTransformerActionInit aMasterPageActionTable[] =
+static XMLTransformerActionInit const aMasterPageActionTable[] =
 {
     ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ),
     ENTRY0( STYLE, NEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
@@ -657,7 +657,7 @@ static XMLTransformerActionInit aMasterPageActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aFontDeclActionTable[] =
+static XMLTransformerActionInit const aFontDeclActionTable[] =
 {
     ENTRY1Q( FO, FONT_FAMILY, XML_ATACTION_RENAME,
                         XML_NAMESPACE_SVG, XML_FONT_FAMILY ),
@@ -667,7 +667,7 @@ static XMLTransformerActionInit aFontDeclActionTable[] =
 };
 
 // action table for OOO_PARA_ACTIONS
-static XMLTransformerActionInit aParaActionTable[] =
+static XMLTransformerActionInit const aParaActionTable[] =
 {
     ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
     ENTRY0( TEXT, COND_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
@@ -678,7 +678,7 @@ static XMLTransformerActionInit aParaActionTable[] =
 };
 
 // action table for OOO_STYLE_REF_ACTIONS
-static XMLTransformerActionInit aStyleRefActionTable[] =
+static XMLTransformerActionInit const aStyleRefActionTable[] =
 {
     ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
     ENTRY0( TEXT, VISITED_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
@@ -708,7 +708,7 @@ static XMLTransformerActionInit aStyleRefActionTable[] =
 // OOO_SHAPE_ACTIONS
 // !!ATTENTION!! If you change something here, please also change
 // aConnectorActionTable if appropriate
-static XMLTransformerActionInit aShapeActionTable[] =
+static XMLTransformerActionInit const aShapeActionTable[] =
 {
     ENTRY0( SVG, X, XML_ATACTION_INCH2IN ),
     ENTRY0( SVG, Y, XML_ATACTION_INCH2IN ),
@@ -753,7 +753,7 @@ static XMLTransformerActionInit aShapeActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aConnectorActionTable[] =
+static XMLTransformerActionInit const aConnectorActionTable[] =
 {
     ENTRY0( SVG, X1, XML_ATACTION_TWIPS2IN ),
     ENTRY0( SVG, Y1, XML_ATACTION_TWIPS2IN ),
@@ -778,7 +778,7 @@ static XMLTransformerActionInit aConnectorActionTable[] =
 };
 
 // OOO_INDEX_ENTRY_TAB_STOP_ACTIONS
-static XMLTransformerActionInit aIndexEntryTabStopActionTable[] =
+static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] =
 {
     ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ),
     ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
@@ -786,7 +786,7 @@ static XMLTransformerActionInit aIndexEntryTabStopActionTable[] =
 };
 
 // OOO_TAB_STOP_ACTIONS
-static XMLTransformerActionInit aTabStopActionTable[] =
+static XMLTransformerActionInit const aTabStopActionTable[] =
 {
     ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ),
     ENTRY1Q( STYLE, LEADER_CHAR, XML_ATACTION_RENAME,
@@ -795,7 +795,7 @@ static XMLTransformerActionInit aTabStopActionTable[] =
 };
 
 // OOO_LINENUMBERING_ACTIONS
-static XMLTransformerActionInit aLineNumberingActionTable[] =
+static XMLTransformerActionInit const aLineNumberingActionTable[] =
 {
     ENTRY0( TEXT, OFFSET, XML_ATACTION_INCH2IN ),
     ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
@@ -804,7 +804,7 @@ static XMLTransformerActionInit aLineNumberingActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aFootnoteSepActionTable[] =
+static XMLTransformerActionInit const aFootnoteSepActionTable[] =
 {
     ENTRY0( STYLE, WIDTH, XML_ATACTION_INCH2IN ),
     ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_INCH2IN ),
@@ -813,14 +813,14 @@ static XMLTransformerActionInit aFootnoteSepActionTable[] =
 };
 
 // OOO_DROP_CAP_ACTIONS
-static XMLTransformerActionInit aDropCapActionTable[] =
+static XMLTransformerActionInit const aDropCapActionTable[] =
 {
     ENTRY0( STYLE, DISTANCE, XML_ATACTION_INCH2IN ),
     ENTRY0( STYLE, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aColumnsActionTable[] =
+static XMLTransformerActionInit const aColumnsActionTable[] =
 {
     ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_INCH2IN ),
 //  ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_INCH2IN ),
@@ -834,7 +834,7 @@ static XMLTransformerActionInit aColumnsActionTable[] =
 };
 
 // OOO_TEXT_VALUE_TYPE_ACTIONS
-static XMLTransformerActionInit aTextValueTypeActionTable[] =
+static XMLTransformerActionInit const aTextValueTypeActionTable[] =
 {
     ENTRY1Q( TEXT, VALUE_TYPE, XML_ATACTION_RENAME,
            XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
@@ -857,7 +857,7 @@ static XMLTransformerActionInit aTextValueTypeActionTable[] =
 };
 
 // OOO_TABLE_VALUE_TYPE_ACTIONS
-static XMLTransformerActionInit aTableValueTypeActionTable[] =
+static XMLTransformerActionInit const aTableValueTypeActionTable[] =
 {
     ENTRY1Q( TABLE, VALUE_TYPE, XML_ATACTION_RENAME,
            XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
@@ -882,7 +882,7 @@ static XMLTransformerActionInit aTableValueTypeActionTable[] =
 };
 
 // action table for OOO_ANNOTATION_ACTIONS
-static XMLTransformerActionInit aAnnotationActionTable[] =
+static XMLTransformerActionInit const aAnnotationActionTable[] =
 {
     ENTRY1Q( OFFICE, AUTHOR, XML_ATACTION_MOVE_TO_ELEM,
                 XML_NAMESPACE_DC, XML_CREATOR ),
@@ -894,7 +894,7 @@ static XMLTransformerActionInit aAnnotationActionTable[] =
 };
 
 // action table for OOO_CHANGE_INFO_ACTIONS
-static XMLTransformerActionInit aChangeInfoActionTable[] =
+static XMLTransformerActionInit const aChangeInfoActionTable[] =
 {
     ENTRY1Q( OFFICE, CHG_AUTHOR, XML_ATACTION_MOVE_TO_ELEM,
                 XML_NAMESPACE_DC, XML_CREATOR ),
@@ -904,7 +904,7 @@ static XMLTransformerActionInit aChangeInfoActionTable[] =
 };
 
 // OOO_BACKGROUND_IMAGE_ACTIONS
-static XMLTransformerActionInit aBackgroundImageActionTable[] =
+static XMLTransformerActionInit const aBackgroundImageActionTable[] =
 {
     ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_RENAME_NEG_PERCENT,
                      XML_NAMESPACE_DRAW, XML_OPACITY ),
@@ -916,7 +916,7 @@ static XMLTransformerActionInit aBackgroundImageActionTable[] =
    OpenOffice.org text documents, written by OpenOffice.org, contain
    wrong value for the transparency of the background graphic (#i50322#)
 */
-static XMLTransformerActionInit aWriterBackgroundImageActionTable[] =
+static XMLTransformerActionInit const aWriterBackgroundImageActionTable[] =
 {
     ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY ),
     ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
@@ -924,7 +924,7 @@ static XMLTransformerActionInit aWriterBackgroundImageActionTable[] =
 };
 
 // OOO_DDE_CONNECTION_DECL
-static XMLTransformerActionInit aDDEConnectionDeclActionTable[] =
+static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] =
 {
     ENTRY1Q( TEXT, NAME, XML_ATACTION_RENAME,
                      XML_NAMESPACE_OFFICE, XML_NAME ),
@@ -932,7 +932,7 @@ static XMLTransformerActionInit aDDEConnectionDeclActionTable[] =
 };
 
 // OOO_FORM_CONTROL_ACTIONS
-static XMLTransformerActionInit aFormControlActionTable[] =
+static XMLTransformerActionInit const aFormControlActionTable[] =
 {
     ENTRY2QN( FORM, SERVICE_NAME,
                     XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX,
@@ -943,7 +943,7 @@ static XMLTransformerActionInit aFormControlActionTable[] =
 };
 
 // OOO_FORM_COLUMN_ACTIONS
-static XMLTransformerActionInit aFormColumnActionTable[] =
+static XMLTransformerActionInit const aFormColumnActionTable[] =
 {
     ENTRY1Q( FORM, COLUMN_STYLE_NAME, XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF,
                         XML_NAMESPACE_FORM, XML_TEXT_STYLE_NAME ),
@@ -955,7 +955,7 @@ static XMLTransformerActionInit aFormColumnActionTable[] =
 };
 
 // OOO_FORM_PROP_ACTIONS
-static XMLTransformerActionInit aFormPropActionTable[] =
+static XMLTransformerActionInit const aFormPropActionTable[] =
 {
     ENTRY1Q( FORM, PROPERTY_TYPE, XML_ATACTION_RENAME,
                           XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
@@ -964,14 +964,14 @@ static XMLTransformerActionInit aFormPropActionTable[] =
 };
 
 // OOO_XLINK_ACTIONS
-static XMLTransformerActionInit aXLinkActionTable[] =
+static XMLTransformerActionInit const aXLinkActionTable[] =
 {
     ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_CONFIG_ITEM_SET_ACTIONS
-static XMLTransformerActionInit aConfigItemSetActionTable[] =
+static XMLTransformerActionInit const aConfigItemSetActionTable[] =
 {
     ENTRY1( CONFIG, NAME, XML_ATACTION_ADD_NAMESPACE_PREFIX,
                     XML_NAMESPACE_OOO ),
@@ -979,7 +979,7 @@ static XMLTransformerActionInit aConfigItemSetActionTable[] =
 };
 
 // OASIS_FORMULA_ACTIONS
-static XMLTransformerActionInit aFormulaActionTable[] =
+static XMLTransformerActionInit const aFormulaActionTable[] =
 {
     ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX,
                      XML_NAMESPACE_OOOW ),
@@ -993,14 +993,14 @@ static XMLTransformerActionInit aFormulaActionTable[] =
 };
 
 // OOO_ERROR_MACRO_ACTIONS
-static XMLTransformerActionInit aErrorMacroActionTable[] =
+static XMLTransformerActionInit const aErrorMacroActionTable[] =
 {
     ENTRY0( TABLE, NAME, XML_ATACTION_REMOVE ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_DDE_CONV_MODE_ACTIONS
-static XMLTransformerActionInit aDDEConvModeActionTable[] =
+static XMLTransformerActionInit const aDDEConvModeActionTable[] =
 {
     ENTRY1Q( TABLE, LET_TEXT, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_KEEP_TEXT ),
@@ -1008,7 +1008,7 @@ static XMLTransformerActionInit aDDEConvModeActionTable[] =
 };
 
 // OOO_DATAPILOT_MEMBER_ACTIONS
-static XMLTransformerActionInit aDataPilotMemberActionTable[] =
+static XMLTransformerActionInit const aDataPilotMemberActionTable[] =
 {
     ENTRY1Q( TABLE, DISPLAY_DETAILS, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_SHOW_DETAILS ),
@@ -1016,7 +1016,7 @@ static XMLTransformerActionInit aDataPilotMemberActionTable[] =
 };
 
 // OOO_DATAPILOT_LEVEL_ACTIONS
-static XMLTransformerActionInit aDataPilotLevelActionTable[] =
+static XMLTransformerActionInit const aDataPilotLevelActionTable[] =
 {
     ENTRY1Q( TABLE, DISPLAY_EMPTY, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_SHOW_EMPTY ),
@@ -1024,7 +1024,7 @@ static XMLTransformerActionInit aDataPilotLevelActionTable[] =
 };
 
 // OOO_SOURCE_SERVICE_ACTIONS
-static XMLTransformerActionInit aSourceServiceActionTable[] =
+static XMLTransformerActionInit const aSourceServiceActionTable[] =
 {
     ENTRY1Q( TABLE, USERNAME, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_USER_NAME ),
@@ -1032,7 +1032,7 @@ static XMLTransformerActionInit aSourceServiceActionTable[] =
 };
 
 // OOO_ANIMATION_ACTIONS
-static XMLTransformerActionInit aAnimationsActionTable[] =
+static XMLTransformerActionInit const aAnimationsActionTable[] =
 {
     ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_SHAPEID ),
     ENTRY0( PRESENTATION, PATH_ID, XML_ATACTION_SHAPEID ),
@@ -1040,7 +1040,7 @@ static XMLTransformerActionInit aAnimationsActionTable[] =
 };
 
 // OOO_DRAW_AREA_POLYGON_ACTIONS (to be added to OOO_SHAPE_ACTIONS)
-static XMLTransformerActionInit aDrawAreaPolygonActionTable[] =
+static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] =
 {
     ENTRY1Q( SVG, POINTS, XML_ATACTION_RENAME,
              XML_NAMESPACE_DRAW, XML_POINTS ),
@@ -1048,7 +1048,7 @@ static XMLTransformerActionInit aDrawAreaPolygonActionTable[] =
 };
 
 // OOO_CHART_ACTIONS
-static XMLTransformerActionInit aChartActionTable[] =
+static XMLTransformerActionInit const aChartActionTable[] =
 {
     ENTRY1( CHART, CLASS, XML_ATACTION_ADD_NAMESPACE_PREFIX,
                      XML_NAMESPACE_CHART ),
@@ -1060,7 +1060,7 @@ static XMLTransformerActionInit aChartActionTable[] =
 };
 
 // OOO_ALPHABETICAL_INDEX_MARK_ACTIONS
-static XMLTransformerActionInit aAlphabeticalIndexMarkActionTable[] =
+static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] =
 {
     ENTRY1Q( TEXT, MAIN_ETRY, XML_ATACTION_RENAME,
              XML_NAMESPACE_TEXT, XML_MAIN_ENTRY ),
@@ -1068,7 +1068,7 @@ static XMLTransformerActionInit aAlphabeticalIndexMarkActionTable[] =
 };
 
 // OOO_SCRIPT_ACTIONS
-static XMLTransformerActionInit aScriptActionTable[] =
+static XMLTransformerActionInit const aScriptActionTable[] =
 {
     ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ),
     ENTRY1Q( SCRIPT, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_OOO, XML_NAME ),
@@ -1076,7 +1076,7 @@ static XMLTransformerActionInit aScriptActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTokenEnum aTokenMap[] =
+static XMLTokenEnum const aTokenMap[] =
 {
     XML_NONE, XML_SINGLE, XML_DOUBLE, XML_BOLD, XML_BOLD_DOTTED,
     XML_BOLD_DASH, XML_BOLD_LONG_DASH, XML_BOLD_DOT_DASH,
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 92c929ce2b15..f555e35c1db0 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -101,7 +101,7 @@ enum XMLUserDefinedTransformerAction
 #define RENAME_ENTRY( f, s ) \
     (static_cast< sal_Int32 >(f) | (static_cast< sal_Int32 >(s) << 16))
 
-static XMLTransformerActionInit aActionTable[] =
+static XMLTransformerActionInit const aActionTable[] =
 {
     // add office:class from <office:document> and <office:document-content>
     ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ),
@@ -561,7 +561,7 @@ static XMLTransformerActionInit aActionTable[] =
 };
 
 // XML_ETACTION_STYLE
-static XMLTransformerActionInit aStyleActionTable[] =
+static XMLTransformerActionInit const aStyleActionTable[] =
 {
     ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ),
     ENTRY1( STYLE, NAME, XML_ATACTION_DECODE_STYLE_NAME,
@@ -595,7 +595,7 @@ static XMLTransformerActionInit aStyleActionTable[] =
 };
 
 // OASIS_FRAME_ELEM_ACTIONS
-static XMLTransformerActionInit aFrameActionTable[] =
+static XMLTransformerActionInit const aFrameActionTable[] =
 {
     ENTRY0( DRAW, TEXT_BOX, XML_ETACTION_COPY ),
     ENTRY0( DRAW, IMAGE, XML_ETACTION_COPY ),
@@ -608,7 +608,7 @@ static XMLTransformerActionInit aFrameActionTable[] =
 };
 
 // OASIS_EVENT_ELEM_ACTIONS
-static XMLTransformerActionInit aEventActionTable[] =
+static XMLTransformerActionInit const aEventActionTable[] =
 {
     ENTRY0( XLINK, HREF, XML_ATACTION_HREF ),
     ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_REMOVE_NAMESPACE_PREFIX,
@@ -619,13 +619,13 @@ static XMLTransformerActionInit aEventActionTable[] =
 };
 
 // OASIS_EVENT_ELEM_ACTIONS
-static XMLTransformerActionInit aDlgActionTable[] =
+static XMLTransformerActionInit const aDlgActionTable[] =
 {
     ENTRY0( DLG, BORDER, XML_ATACTION_DLG_BORDER )
 };
 
 // action table for OASIS_MASTER_PAGE_ACTIONS
-static XMLTransformerActionInit aMasterPageActionTable[] =
+static XMLTransformerActionInit const aMasterPageActionTable[] =
 {
     ENTRY1( STYLE, NAME, XML_ATACTION_DECODE_STYLE_NAME,
                  XML_FAMILY_TYPE_MASTER_PAGE ),
@@ -639,7 +639,7 @@ static XMLTransformerActionInit aMasterPageActionTable[] =
 };
 
 // action table for OASIS_TEXT_STYLE_REF_ACTIONS
-static XMLTransformerActionInit aTextStyleRefActionTable[] =
+static XMLTransformerActionInit const aTextStyleRefActionTable[] =
 {
     ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_TEXT ),
@@ -650,7 +650,7 @@ static XMLTransformerActionInit aTextStyleRefActionTable[] =
 };
 
 // action table for OASIS_PARA_STYLE_REF_ACTIONS
-static XMLTransformerActionInit aParaStyleRefActionTable[] =
+static XMLTransformerActionInit const aParaStyleRefActionTable[] =
 {
     ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_PARAGRAPH ),
@@ -658,7 +658,7 @@ static XMLTransformerActionInit aParaStyleRefActionTable[] =
 };
 
 // action table for OASIS_LIST_STYLE_REF_ACTIONS
-static XMLTransformerActionInit aListStyleRefActionTable[] =
+static XMLTransformerActionInit const aListStyleRefActionTable[] =
 {
     ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_LIST ),
@@ -666,7 +666,7 @@ static XMLTransformerActionInit aListStyleRefActionTable[] =
 };
 
 // action table for OASIS_MASTER_PAGE_REF_ACTIONS
-static XMLTransformerActionInit aMasterPageRefActionTable[] =
+static XMLTransformerActionInit const aMasterPageRefActionTable[] =
 {
     ENTRY1( DRAW, MASTER_PAGE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_MASTER_PAGE ),
@@ -674,7 +674,7 @@ static XMLTransformerActionInit aMasterPageRefActionTable[] =
 };
 
 // action table for OASIS_MAP_STYLE_REF_ACTIONS
-static XMLTransformerActionInit aMapStyleRefActionTable[] =
+static XMLTransformerActionInit const aMapStyleRefActionTable[] =
 {
     ENTRY1( STYLE, APPLY_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_END ),
@@ -682,14 +682,14 @@ static XMLTransformerActionInit aMapStyleRefActionTable[] =
 };
 
 // action table for OASIS_TABLE_STYLE_REF_ACTIONS (#i40011#, #i40015#)
-static XMLTransformerActionInit aTableStyleRefActionTable[] =
+static XMLTransformerActionInit const aTableStyleRefActionTable[] =
 {
     ENTRY1( TABLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_END ),
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aFontFaceActionTable[] =
+static XMLTransformerActionInit const aFontFaceActionTable[] =
 {
     ENTRY1Q( SVG, FONT_FAMILY, XML_ATACTION_RENAME,
                         XML_NAMESPACE_FO, XML_FONT_FAMILY ),
@@ -699,7 +699,7 @@ static XMLTransformerActionInit aFontFaceActionTable[] =
 };
 
 // action table for OASIS_PARA_ACTIONS
-static XMLTransformerActionInit aParaActionTable[] =
+static XMLTransformerActionInit const aParaActionTable[] =
 {
     ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_PARAGRAPH ),
@@ -712,7 +712,7 @@ static XMLTransformerActionInit aParaActionTable[] =
 
 // !!ATTENTION!! If you change something here, please also change
 // aConnectorActionTable if appropriate
-static XMLTransformerActionInit aShapeActionTable[] =
+static XMLTransformerActionInit const aShapeActionTable[] =
 {
     ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_GRAPHIC ),
@@ -761,7 +761,7 @@ static XMLTransformerActionInit aShapeActionTable[] =
 };
 
 // OASIS_ANIMATION_ACTIONS
-static XMLTransformerActionInit aAnimationActionTable[] =
+static XMLTransformerActionInit const aAnimationActionTable[] =
 {
     ENTRY0( DRAW, SHAPE_ID, XML_ATACTION_DECODE_ID ),
     ENTRY0( PRESENTATION, DELAY,       XML_ATACTION_RNG2ISO_DATETIME ),
@@ -771,7 +771,7 @@ static XMLTransformerActionInit aAnimationActionTable[] =
 };
 
 // OOO_CONNECTOR_ACTIONS
-static XMLTransformerActionInit aConnectorActionTable[] =
+static XMLTransformerActionInit const aConnectorActionTable[] =
 {
     ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
                 XML_FAMILY_TYPE_GRAPHIC ),
@@ -802,7 +802,7 @@ static XMLTransformerActionInit aConnectorActionTable[] =
 };
 
 // OASIS_INDEX_ENTRY_TAB_STOP_ACTIONS
-static XMLTransformerActionInit aIndexEntryTabStopActionTable[] =
+static XMLTransformerActionInit const aIndexEntryTabStopActionTable[] =
 {
     ENTRY0( STYLE, POSITION, XML_ATACTION_IN2INCH ),
     ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
@@ -811,7 +811,7 @@ static XMLTransformerActionInit aIndexEntryTabStopActionTable[] =
 };
 
 // OASIS_TAB_STOP_ACTIONS
-static XMLTransformerActionInit aTabStopActionTable[] =
+static XMLTransformerActionInit const aTabStopActionTable[] =
 {
     ENTRY0( STYLE, POSITION, XML_ATACTION_IN2INCH ),
     ENTRY1Q( STYLE, LEADER_TEXT, XML_ATACTION_RENAME,
@@ -825,7 +825,7 @@ static XMLTransformerActionInit aTabStopActionTable[] =
 };
 
 // OASIS_LINENUMBERING_ACTIONS
-static XMLTransformerActionInit aLineNumberingActionTable[] =
+static XMLTransformerActionInit const aLineNumberingActionTable[] =
 {
     ENTRY0( TEXT, OFFSET, XML_ATACTION_IN2INCH ),
     ENTRY1( TEXT, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
@@ -835,7 +835,7 @@ static XMLTransformerActionInit aLineNumberingActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aFootnoteSepActionTable[] =
+static XMLTransformerActionInit const aFootnoteSepActionTable[] =
 {
     ENTRY0( STYLE, WIDTH, XML_ATACTION_IN2INCH ),
     ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_IN2INCH ),
@@ -844,7 +844,7 @@ static XMLTransformerActionInit aFootnoteSepActionTable[] =
 };
 
 // OASIS_NOTES_ACTIONS (processed by special context)
-static XMLTransformerActionInit aNotesActionTable[] =
+static XMLTransformerActionInit const aNotesActionTable[] =
 {
     ENTRY0( TEXT, NOTE_CLASS, XML_ATACTION_STYLE_FAMILY ),
     ENTRY1( TEXT, CITATION_STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
@@ -859,7 +859,7 @@ static XMLTransformerActionInit aNotesActionTable[] =
 };
 
 // OASIS_DROP_CAP_ACTIONS
-static XMLTransformerActionInit aDropCapActionTable[] =
+static XMLTransformerActionInit const aDropCapActionTable[] =
 {
     ENTRY0( STYLE, DISTANCE, XML_ATACTION_IN2INCH ),
     ENTRY1( STYLE, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
@@ -867,7 +867,7 @@ static XMLTransformerActionInit aDropCapActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
-static XMLTransformerActionInit aColumnsActionTable[] =
+static XMLTransformerActionInit const aColumnsActionTable[] =
 {
     ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_IN2INCH ),
     ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_REMOVE ),
@@ -881,7 +881,7 @@ static XMLTransformerActionInit aColumnsActionTable[] =
 };
 
 // OASIS_TEXT_VALUE_TYPE_ACTIONS
-static XMLTransformerActionInit aTextValueTypeActionTable[] =
+static XMLTransformerActionInit const aTextValueTypeActionTable[] =
 {
     ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME,
            XML_NAMESPACE_TEXT, XML_VALUE_TYPE ),
@@ -902,7 +902,7 @@ static XMLTransformerActionInit aTextValueTypeActionTable[] =
 };
 
 // OASIS_TABLE_VALUE_TYPE_ACTIONS
-static XMLTransformerActionInit aTableValueTypeActionTable[] =
+static XMLTransformerActionInit const aTableValueTypeActionTable[] =
 {
     ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME,
            XML_NAMESPACE_TABLE, XML_VALUE_TYPE ),
@@ -927,7 +927,7 @@ static XMLTransformerActionInit aTableValueTypeActionTable[] =
 };
 
 // action table for OASIS_ANNOTATION_ACTIONS
-static XMLTransformerActionInit aAnnotationActionTable[] =
+static XMLTransformerActionInit const aAnnotationActionTable[] =
 {
     ENTRY1Q( DC, CREATOR, XML_ETACTION_MOVE_TO_ATTR,
                 XML_NAMESPACE_OFFICE, XML_AUTHOR ),
@@ -940,7 +940,7 @@ static XMLTransformerActionInit aAnnotationActionTable[] =
 };
 
 // action table for OASIS_CHANGE_INFO_ACTIONS
-static XMLTransformerActionInit aChangeInfoActionTable[] =
+static XMLTransformerActionInit const aChangeInfoActionTable[] =
 {
     ENTRY1Q( DC, CREATOR, XML_ETACTION_MOVE_TO_ATTR,
                 XML_NAMESPACE_OFFICE, XML_CHG_AUTHOR ),
@@ -950,7 +950,7 @@ static XMLTransformerActionInit aChangeInfoActionTable[] =
 };
 
 // OASIS_BACKGROUND_IMAGE_ACTIONS
-static XMLTransformerActionInit aBackgroundImageActionTable[] =
+static XMLTransformerActionInit const aBackgroundImageActionTable[] =
 {
     ENTRY1Q( DRAW, OPACITY, XML_ATACTION_RENAME_NEG_PERCENT,
                      XML_NAMESPACE_DRAW, XML_TRANSPARENCY ),
@@ -959,7 +959,7 @@ static XMLTransformerActionInit aBackgroundImageActionTable[] =
 };
 
 // OASIS_DDE_CONNECTION_DECL
-static XMLTransformerActionInit aDDEConnectionDeclActionTable[] =
+static XMLTransformerActionInit const aDDEConnectionDeclActionTable[] =
 {
     ENTRY1Q( OFFICE, NAME, XML_ATACTION_RENAME,
                      XML_NAMESPACE_TEXT, XML_NAME ),
@@ -967,7 +967,7 @@ static XMLTransformerActionInit aDDEConnectionDeclActionTable[] =
 };
 
 // OASIS_FORM_CONTROL_ACTIONS
-static XMLTransformerActionInit aFormControlActionTable[] =
+static XMLTransformerActionInit const aFormControlActionTable[] =
 {
     ENTRY0( FORM, NAME, XML_ATACTION_MOVE_TO_ELEM ),
     ENTRY2QN( FORM, CONTROL_IMPLEMENTATION,
@@ -980,7 +980,7 @@ static XMLTransformerActionInit aFormControlActionTable[] =
 };
 
 // OASIS_FORM_COLUMN_ACTIONS
-static XMLTransformerActionInit aFormColumnActionTable[] =
+static XMLTransformerActionInit const aFormColumnActionTable[] =
 {
     ENTRY1Q( FORM, TEXT_STYLE_NAME, XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF,
                         XML_NAMESPACE_FORM, XML_COLUMN_STYLE_NAME ),
@@ -992,7 +992,7 @@ static XMLTransformerActionInit aFormColumnActionTable[] =
 };
 
 // OASIS_FORM_PROP_ACTIONS
-static XMLTransformerActionInit aFormPropActionTable[] =
+static XMLTransformerActionInit const aFormPropActionTable[] =
 {
     ENTRY1Q( OFFICE, VALUE_TYPE, XML_ATACTION_RENAME,
                           XML_NAMESPACE_FORM, XML_PROPERTY_TYPE ),
@@ -1006,7 +1006,7 @@ static XMLTransformerActionInit aFormPropActionTable[] =
 };
 
 // OASIS_XLINK_ACTIONS
-static XMLTransformerActionInit aXLinkActionTable[] =
+static XMLTransformerActionInit const aXLinkActionTable[] =
 {
     ENTRY1( XLINK, HREF, XML_ATACTION_URI_OASIS, sal_uInt32(false) ),
     ENTRY0( TABLE, REFRESH_DELAY, XML_ATACTION_RNG2ISO_DATETIME ),
@@ -1014,7 +1014,7 @@ static XMLTransformerActionInit aXLinkActionTable[] =
 };
 
 // OASIS_CONFIG_ITEM_SET_ACTIONS
-static XMLTransformerActionInit aConfigItemSetActionTable[] =
+static XMLTransformerActionInit const aConfigItemSetActionTable[] =
 {
     ENTRY1( CONFIG, NAME, XML_ATACTION_REMOVE_NAMESPACE_PREFIX,
                     XML_NAMESPACE_OOO ),
@@ -1022,7 +1022,7 @@ static XMLTransformerActionInit aConfigItemSetActionTable[] =
 };
 
 // OASIS_FORMULA_ACTIONS
-static XMLTransformerActionInit aFormulaActionTable[] =
+static XMLTransformerActionInit const aFormulaActionTable[] =
 {
     ENTRY0( TEXT, CONDITION, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ),
     ENTRY0( TEXT, FORMULA, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ),
@@ -1032,7 +1032,7 @@ static XMLTransformerActionInit aFormulaActionTable[] =
 };
 
 // OASIS_CONTENT_VALIDATION_ACTIONS
-static XMLTransformerActionInit aContentValidationActionTable[] =
+static XMLTransformerActionInit const aContentValidationActionTable[] =
 {
     ENTRY0( TABLE, CONDITION, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ),
     ENTRY0( TABLE, DISPLAY_LIST, XML_ATACTION_REMOVE ),
@@ -1040,7 +1040,7 @@ static XMLTransformerActionInit aContentValidationActionTable[] =
 };
 
 // OASIS_DDE_CONV_MODE_ACTIONS
-static XMLTransformerActionInit aDDEConvModeActionTable[] =
+static XMLTransformerActionInit const aDDEConvModeActionTable[] =
 {
     ENTRY1Q( TABLE, KEEP_TEXT, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_LET_TEXT ),
@@ -1048,7 +1048,7 @@ static XMLTransformerActionInit aDDEConvModeActionTable[] =
 };
 
 // OASIS_DATAPILOT_MEMBER_ACTIONS
-static XMLTransformerActionInit aDataPilotMemberActionTable[] =
+static XMLTransformerActionInit const aDataPilotMemberActionTable[] =
 {
     ENTRY1Q( TABLE, SHOW_DETAILS, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_DISPLAY_DETAILS ),
@@ -1056,7 +1056,7 @@ static XMLTransformerActionInit aDataPilotMemberActionTable[] =
 };
 
 // OASIS_DATAPILOT_LEVEL_ACTIONS
-static XMLTransformerActionInit aDataPilotLevelActionTable[] =
+static XMLTransformerActionInit const aDataPilotLevelActionTable[] =
 {
     ENTRY1Q( TABLE, SHOW_EMPTY, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_DISPLAY_EMPTY ),
@@ -1064,7 +1064,7 @@ static XMLTransformerActionInit aDataPilotLevelActionTable[] =
 };
 
 // OASIS_SOURCE_SERVICE_ACTIONS
-static XMLTransformerActionInit aSourceServiceActionTable[] =
+static XMLTransformerActionInit const aSourceServiceActionTable[] =
 {
     ENTRY1Q( TABLE, USER_NAME, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TABLE, XML_USERNAME ),
@@ -1072,7 +1072,7 @@ static XMLTransformerActionInit aSourceServiceActionTable[] =
 };
 
 // OASIS_CHART_ACTIONS
-static XMLTransformerActionInit aChartActionTable[] =
+static XMLTransformerActionInit const aChartActionTable[] =
 {
     ENTRY0( CHART, CLASS, XML_ATACTION_REMOVE_ANY_NAMESPACE_PREFIX ),
     ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
@@ -1083,7 +1083,7 @@ static XMLTransformerActionInit aChartActionTable[] =
 };
 
 // OASIS_FORM_ACTIONS
-static XMLTransformerActionInit aFormActionTable[] =
+static XMLTransformerActionInit const aFormActionTable[] =
 {
     ENTRY2QN( FORM, CONTROL_IMPLEMENTATION,
                     XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX,
@@ -1094,7 +1094,7 @@ static XMLTransformerActionInit aFormActionTable[] =
 };
 
 // OASIS_ALPHABETICAL_INDEX_MARK_ACTIONS
-static XMLTransformerActionInit aAlphabeticalIndexMarkActionTable[] =
+static XMLTransformerActionInit const aAlphabeticalIndexMarkActionTable[] =
 {
     ENTRY1Q( TEXT, MAIN_ENTRY, XML_ATACTION_RENAME,
                         XML_NAMESPACE_TEXT, XML_MAIN_ETRY ),
@@ -1102,7 +1102,7 @@ static XMLTransformerActionInit aAlphabeticalIndexMarkActionTable[] =
 };
 
 // OASIS_DRAW_AREA_POLYGON_ACTIONS (to be added to OASIS_SHAPE_ACTIONS)
-static XMLTransformerActionInit aDrawAreaPolygonActionTable[] =
+static XMLTransformerActionInit const aDrawAreaPolygonActionTable[] =
 {
     ENTRY1Q( DRAW, POINTS, XML_ATACTION_RENAME,
              XML_NAMESPACE_SVG, XML_POINTS ),
@@ -1110,7 +1110,7 @@ static XMLTransformerActionInit aDrawAreaPolygonActionTable[] =
 };
 
 // OASIS_SCRIPT_ACTIONS
-static XMLTransformerActionInit aScriptActionTable[] =
+static XMLTransformerActionInit const aScriptActionTable[] =
 {
     ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_REMOVE_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ),
     ENTRY1Q( OOO, NAME, XML_ATACTION_RENAME, XML_NAMESPACE_SCRIPT, XML_NAME ),
@@ -1119,7 +1119,7 @@ static XMLTransformerActionInit aScriptActionTable[] =
 };
 
 // OASIS_DATETIME_ACTIONS
-static XMLTransformerActionInit aDateTimeActionTable[] =
+static XMLTransformerActionInit const aDateTimeActionTable[] =
 {
     ENTRY0( TEXT,   DATE_VALUE,        XML_ATACTION_RNG2ISO_DATETIME ),
     ENTRY0( TEXT,   TIME_VALUE,        XML_ATACTION_RNG2ISO_DATETIME ),
@@ -1138,7 +1138,7 @@ static XMLTransformerActionInit aDateTimeActionTable[] =
     ENTRY0( OFFICE, TOKEN_INVALID,     XML_ATACTION_EOT )
 };
 
-static XMLTokenEnum aTokenMap[] =
+static XMLTokenEnum const aTokenMap[] =
 {
     XML_NONE, XML_SOLID, XML_DOTTED, XML_DASH, XML_LONG_DASH, XML_DOT_DASH,
     XML_DOT_DOT_DASH, XML_WAVE, XML_SMALL_WAVE, XML_TOKEN_END
diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx
index af64658e6523..0f4b9a3ace0f 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.cxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.cxx
@@ -26,7 +26,7 @@ using namespace ::xmloff::token;
 
 #define NO_PARAMS 0, 0, 0
 
-XMLTransformerActionInit aGraphicPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aGraphicPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_SVG, XML_STROKE_WIDTH, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -179,7 +179,7 @@ XMLTransformerActionInit aGraphicPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aDrawingPagePropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aDrawingPagePropertyOASISAttrActionTable[] =
 {
     // style-graphic-fill-properties-attlist
     { XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
@@ -203,7 +203,7 @@ XMLTransformerActionInit aDrawingPagePropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aPageLayoutPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aPageLayoutPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_PAGE_WIDTH, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -259,7 +259,7 @@ XMLTransformerActionInit aPageLayoutPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aHeaderFooterPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aHeaderFooterPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_SVG, XML_HEIGHT, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -308,7 +308,7 @@ XMLTransformerActionInit aHeaderFooterPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTextPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aTextPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_FONT_SIZE, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -354,7 +354,7 @@ XMLTransformerActionInit aTextPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aParagraphPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aParagraphPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_OPTACTION_CONTROL_TEXT_ALIGN,
         NO_PARAMS },
@@ -406,7 +406,7 @@ XMLTransformerActionInit aParagraphPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aSectionPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aSectionPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -415,7 +415,7 @@ XMLTransformerActionInit aSectionPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTablePropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aTablePropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_WIDTH, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -432,14 +432,14 @@ XMLTransformerActionInit aTablePropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableColumnPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aTableColumnPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableRowPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aTableRowPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -448,7 +448,7 @@ XMLTransformerActionInit aTableRowPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableCellPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aTableCellPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, XML_ATACTION_RENAME,
         XMLTransformerActionInit::QNameParam( XML_NAMESPACE_FO,
@@ -503,7 +503,7 @@ XMLTransformerActionInit aTableCellPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aListLevelPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aListLevelPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_TEXT, XML_SPACE_BEFORE, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
@@ -518,7 +518,7 @@ XMLTransformerActionInit aListLevelPropertyOASISAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aChartPropertyOASISAttrActionTable[] =
+XMLTransformerActionInit const aChartPropertyOASISAttrActionTable[] =
 {
     { XML_NAMESPACE_CHART, XML_SYMBOL_WIDTH, XML_ATACTION_IN2INCH,
           NO_PARAMS }, /* generated entry */
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 7ae64e946b87..8efabfd256c2 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -48,19 +48,19 @@ enum XMLPropOASISTransformerAction
     XML_ATACTION_DECODE_PROTECT
 };
 
-extern XMLTransformerActionInit aGraphicPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aDrawingPagePropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aPageLayoutPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aHeaderFooterPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aTextPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aParagraphPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aSectionPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aTablePropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aTableColumnPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aTableRowPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aTableCellPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aListLevelPropertyOASISAttrActionTable[];
-extern XMLTransformerActionInit aChartPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aGraphicPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aDrawingPagePropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aPageLayoutPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aHeaderFooterPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aTextPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aParagraphPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aSectionPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aTablePropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aTableColumnPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aTableRowPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aTableCellPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aListLevelPropertyOASISAttrActionTable[];
+extern XMLTransformerActionInit const aChartPropertyOASISAttrActionTable[];
 
 #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOASIS_HXX
 
diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx
index 092b26629d41..4771e2c4bd7c 100644
--- a/xmloff/source/transform/PropertyActionsOOo.cxx
+++ b/xmloff/source/transform/PropertyActionsOOo.cxx
@@ -25,7 +25,7 @@ using namespace ::xmloff::token;
 
 #define NO_PARAMS 0, 0, 0
 
-XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aGraphicPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_DRAW, XML_STROKE, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
@@ -376,7 +376,7 @@ XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aGraphicPropertyOOoElemActionTable[] =
+XMLTransformerActionInit const aGraphicPropertyOOoElemActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE, XML_ATACTION_COPY, NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_STYLE, XML_COLUMNS, XML_ATACTION_COPY, NO_PARAMS }, /* generated entry */
@@ -384,7 +384,7 @@ XMLTransformerActionInit aGraphicPropertyOOoElemActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aDrawingPagePropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aDrawingPagePropertyOOoAttrActionTable[] =
 {
     // style-graphic-fill-properties-attlist
     { XML_NAMESPACE_DRAW, XML_FILL_GRADIENT_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF,
@@ -401,7 +401,7 @@ XMLTransformerActionInit aDrawingPagePropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aPageLayoutPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aPageLayoutPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_PAGE_WIDTH, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -457,7 +457,7 @@ XMLTransformerActionInit aPageLayoutPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aHeaderFooterPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aHeaderFooterPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_SVG, XML_HEIGHT, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -506,7 +506,7 @@ XMLTransformerActionInit aHeaderFooterPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTextPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aTextPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_FONT_VARIANT, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
@@ -643,13 +643,13 @@ XMLTransformerActionInit aTextPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTextPropertyOOoElemActionTable[] =
+XMLTransformerActionInit const aTextPropertyOOoElemActionTable[] =
 {
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
 
-XMLTransformerActionInit aParagraphPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aParagraphPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_LINE_HEIGHT, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -765,7 +765,7 @@ XMLTransformerActionInit aParagraphPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aParagraphPropertyOOoElemActionTable[] =
+XMLTransformerActionInit const aParagraphPropertyOOoElemActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_TAB_STOPS, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
@@ -776,7 +776,7 @@ XMLTransformerActionInit aParagraphPropertyOOoElemActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aSectionPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aSectionPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -785,7 +785,7 @@ XMLTransformerActionInit aSectionPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTablePropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aTablePropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_WIDTH, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -802,14 +802,14 @@ XMLTransformerActionInit aTablePropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableColumnPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aTableColumnPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableRowPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aTableRowPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -818,7 +818,7 @@ XMLTransformerActionInit aTableRowPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableCellPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aTableCellPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_FO, XML_VERTICAL_ALIGN, XML_ATACTION_RENAME,
         XMLTransformerActionInit::QNameParam( XML_NAMESPACE_STYLE,
@@ -891,14 +891,14 @@ XMLTransformerActionInit aTableCellPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aTableCellPropertyOOoElemActionTable[] =
+XMLTransformerActionInit const aTableCellPropertyOOoElemActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aListLevelPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aListLevelPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_TEXT, XML_SPACE_BEFORE, XML_ATACTION_INCH2IN,
           NO_PARAMS }, /* generated entry */
@@ -913,7 +913,7 @@ XMLTransformerActionInit aListLevelPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aChartPropertyOOoAttrActionTable[] =
+XMLTransformerActionInit const aChartPropertyOOoAttrActionTable[] =
 {
     { XML_NAMESPACE_CHART, XML_SCALE_TEXT, XML_ATACTION_COPY,
           NO_PARAMS }, /* generated entry */
@@ -1049,7 +1049,7 @@ XMLTransformerActionInit aChartPropertyOOoAttrActionTable[] =
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
 };
 
-XMLTransformerActionInit aChartPropertyOOoElemActionTable[] =
+XMLTransformerActionInit const aChartPropertyOOoElemActionTable[] =
 {
     { XML_NAMESPACE_STYLE, XML_SYMBOL_IMAGE, XML_ATACTION_COPY, NO_PARAMS },
     { XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT, NO_PARAMS }
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index 5a08eba72002..b255a4548a23 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -47,24 +47,24 @@ enum XMLPropOOOTransformerAction
     XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY
 };
 
-extern XMLTransformerActionInit aGraphicPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aGraphicPropertyOOoElemActionTable[];
-extern XMLTransformerActionInit aDrawingPagePropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aPageLayoutPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aHeaderFooterPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTextPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTextPropertyOOoElemActionTable[];
-extern XMLTransformerActionInit aParagraphPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aParagraphPropertyOOoElemActionTable[];
-extern XMLTransformerActionInit aSectionPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTablePropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTableColumnPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTableRowPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTableCellPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aTableCellPropertyOOoElemActionTable[];
-extern XMLTransformerActionInit aListLevelPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aChartPropertyOOoAttrActionTable[];
-extern XMLTransformerActionInit aChartPropertyOOoElemActionTable[];
+extern XMLTransformerActionInit const aGraphicPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aGraphicPropertyOOoElemActionTable[];
+extern XMLTransformerActionInit const aDrawingPagePropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aPageLayoutPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aHeaderFooterPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTextPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTextPropertyOOoElemActionTable[];
+extern XMLTransformerActionInit const aParagraphPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aParagraphPropertyOOoElemActionTable[];
+extern XMLTransformerActionInit const aSectionPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTablePropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTableColumnPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTableRowPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTableCellPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aTableCellPropertyOOoElemActionTable[];
+extern XMLTransformerActionInit const aListLevelPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aChartPropertyOOoAttrActionTable[];
+extern XMLTransformerActionInit const aChartPropertyOOoElemActionTable[];
 
 #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOOO_HXX
 
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 091fb2eea0cc..ee56231ccc93 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -920,7 +920,7 @@ bool XMLStyleOASISTContext::IsPersistent() const
 XMLTransformerActions *XMLStyleOASISTContext::CreateTransformerActions(
         sal_uInt16 nType )
 {
-    XMLTransformerActionInit *pInit = nullptr;
+    XMLTransformerActionInit const *pInit = nullptr;
 
     switch( nType )
     {
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index ad530502d71f..fc2c72e33e03 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -1266,7 +1266,7 @@ bool XMLStyleOOoTContext::IsPersistent() const
 XMLTransformerActions *XMLStyleOOoTContext::CreateTransformerActions(
         sal_uInt16 nType )
 {
-    XMLTransformerActionInit *pInit = nullptr;
+    XMLTransformerActionInit const *pInit = nullptr;
 
     switch( nType )
     {
diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx
index a39f27f25034..5db6b96bd545 100644
--- a/xmloff/source/transform/TransformerActions.cxx
+++ b/xmloff/source/transform/TransformerActions.cxx
@@ -26,7 +26,7 @@ using namespace ::osl;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 
-XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit )
+XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit const *pInit )
 {
     if( pInit )
     {
@@ -55,7 +55,7 @@ XMLTransformerActions::~XMLTransformerActions()
 {
 }
 
-void XMLTransformerActions::Add( XMLTransformerActionInit *pInit )
+void XMLTransformerActions::Add( XMLTransformerActionInit const *pInit )
 {
     if( pInit )
     {
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index 606709ca6539..3c7f61c7c365 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -120,10 +120,10 @@ class XMLTransformerActions :
                             NameHash_Impl, NameHash_Impl >
 {
 public:
-    explicit XMLTransformerActions( XMLTransformerActionInit *pInit );
+    explicit XMLTransformerActions( XMLTransformerActionInit const *pInit );
     ~XMLTransformerActions();
 
-    void Add( XMLTransformerActionInit *pInit );
+    void Add( XMLTransformerActionInit const *pInit );
 };
 
 #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTIONS_HXX
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 03ddddb3f738..727deec521d2 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -171,8 +171,8 @@ XMLTransformerActions *XMLTransformerBase::GetUserDefinedActions( sal_uInt16 )
     return nullptr;
 }
 
-XMLTransformerBase::XMLTransformerBase( XMLTransformerActionInit *pInit,
-                                    ::xmloff::token::XMLTokenEnum *pTKMapInit )
+XMLTransformerBase::XMLTransformerBase( XMLTransformerActionInit const *pInit,
+                                    ::xmloff::token::XMLTokenEnum const *pTKMapInit )
     throw () :
     m_pNamespaceMap( new SvXMLNamespaceMap ),
     m_ElemActions( pInit ),
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index 7aded1f949d1..c11e6f6f4477 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -80,8 +80,8 @@ protected:
                                       const OUString& rQName );
 
 public:
-    XMLTransformerBase( XMLTransformerActionInit *pInit,
-                           ::xmloff::token::XMLTokenEnum *pTKMapInit ) throw();
+    XMLTransformerBase( XMLTransformerActionInit const *pInit,
+                           ::xmloff::token::XMLTokenEnum const *pTKMapInit ) throw();
     virtual ~XMLTransformerBase() throw() override;
 
     // css::xml::sax::XDocumentHandler
diff --git a/xmloff/source/transform/TransformerTokenMap.cxx b/xmloff/source/transform/TransformerTokenMap.cxx
index fd599e9980c5..fc114711481a 100644
--- a/xmloff/source/transform/TransformerTokenMap.cxx
+++ b/xmloff/source/transform/TransformerTokenMap.cxx
@@ -21,7 +21,7 @@
 
 using namespace ::xmloff::token;
 
-XMLTransformerTokenMap::XMLTransformerTokenMap( XMLTokenEnum *pInit )
+XMLTransformerTokenMap::XMLTransformerTokenMap( XMLTokenEnum const *pInit )
 {
     if( pInit )
     {
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index 047d8ba96ad0..6e760fb8aa3c 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -28,7 +28,7 @@ class XMLTransformerTokenMap :
     public std::unordered_map< OUString, ::xmloff::token::XMLTokenEnum >
 {
 public:
-    explicit XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit );
+    explicit XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum const *pInit );
 };
 
 #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX