[Libreoffice-commits] .: editeng/source sfx2/source svx/source xmloff/source

Gert Faller gfaller at kemper.freedesktop.org
Sun Dec 12 00:24:36 PST 2010


 editeng/source/items/svxfont.cxx                             |    2 
 editeng/source/misc/svxacorr.cxx                             |    4 
 sfx2/source/appl/appmain.cxx                                 |    2 
 sfx2/source/bastyp/frmhtml.cxx                               |    8 
 sfx2/source/bastyp/frmhtmlw.cxx                              |    8 
 sfx2/source/bastyp/sfxhtml.cxx                               |    2 
 sfx2/source/control/dispatch.cxx                             |    4 
 sfx2/source/doc/objmisc.cxx                                  |    2 
 svx/source/dialog/pfiledlg.cxx                               |    4 
 svx/source/dialog/svxbmpnumvalueset.cxx                      |    2 
 svx/source/unodraw/unoprov.cxx                               |    4 
 svx/source/xml/xmlxtimp.cxx                                  |   12 
 svx/source/xoutdev/xtabcolr.cxx                              |    4 
 xmloff/source/core/xmlexp.cxx                                |    4 
 xmloff/source/core/xmlimp.cxx                                |   82 +++---
 xmloff/source/draw/eventimp.cxx                              |    2 
 xmloff/source/draw/sdpropls.cxx                              |   30 +-
 xmloff/source/style/DashStyle.cxx                            |    2 
 xmloff/source/style/DrawAspectHdl.cxx                        |    2 
 xmloff/source/style/GradientStyle.cxx                        |    2 
 xmloff/source/style/HatchStyle.cxx                           |    2 
 xmloff/source/style/TransGradientStyle.cxx                   |    2 
 xmloff/source/style/adjushdl.cxx                             |    4 
 xmloff/source/style/bordrhdl.cxx                             |    4 
 xmloff/source/style/fonthdl.cxx                              |    4 
 xmloff/source/style/postuhdl.cxx                             |    2 
 xmloff/source/style/prhdlfac.cxx                             |    4 
 xmloff/source/style/undlihdl.cxx                             |    6 
 xmloff/source/style/xmlnume.cxx                              |   48 +--
 xmloff/source/style/xmlnumi.cxx                              |   46 +--
 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx |    2 
 xmloff/source/text/XMLIndexTOCContext.cxx                    |    2 
 xmloff/source/text/XMLIndexTableSourceContext.cxx            |    2 
 xmloff/source/text/XMLLineNumberingExport.cxx                |    2 
 xmloff/source/text/XMLSectionExport.cxx                      |    8 
 xmloff/source/text/XMLTextColumnsContext.cxx                 |    2 
 xmloff/source/text/XMLTextMarkImportContext.cxx              |    2 
 xmloff/source/text/txtflde.cxx                               |  144 +++++------
 xmloff/source/text/txtfldi.cxx                               |    6 
 xmloff/source/text/txtprhdl.cxx                              |   36 +-
 xmloff/source/text/txtvfldi.cxx                              |    2 
 41 files changed, 256 insertions(+), 256 deletions(-)

New commits:
commit fb3c735cff5c4045bf938785bda1157d25910191
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sun Dec 12 09:24:14 2010 +0100

    change of __READONLY_DATA define to const

diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 38795f0..d604aac 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -51,7 +51,7 @@
 
 #ifndef REDUCEDSVXFONT
     const sal_Unicode CH_BLANK = sal_Unicode(' ');  	// ' ' Leerzeichen
-    static sal_Char __READONLY_DATA sDoubleSpace[] = "  ";
+    static sal_Char const sDoubleSpace[] = "  ";
 #endif
 
 /*************************************************************************
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5321f61..1d2be63 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -481,12 +481,12 @@ BOOL SvxAutoCorrect::FnChgOrdinalNumber(
     if( 2 < nEndPos - nSttPos &&
         rCC.isDigit( rTxt, nEndPos - 3 ) )
     {
-        static sal_Char __READONLY_DATA
+        static sal_Char const
             sAll[]		= "th",			/* rest */
             sFirst[]	= "st",      	/* 1 */
             sSecond[]	= "nd",       	/* 2 */
             sThird[]	= "rd";       	/* 3 */
-        static const sal_Char* __READONLY_DATA aNumberTab[ 4 ] =
+        static const sal_Char* const aNumberTab[ 4 ] =
         {
             sAll, sFirst, sSecond, sThird
         };
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index b62d193..85874f8 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -85,7 +85,7 @@ DBG_NAME(SfxAppMainCHAOSReg)
 //===================================================================
 
 #ifdef TF_POOLABLE
-static SfxItemInfo __READONLY_DATA aItemInfos[] =
+static SfxItemInfo const aItemInfos[] =
 {
     { 0, 0 }
 };
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index ad608da..791298a 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -51,14 +51,14 @@
 #define SFX_HTMLFRMSIZE_REL 0x0001
 #define SFX_HTMLFRMSIZE_PERCENT 0x0002
 
-static sal_Char __READONLY_DATA sHTML_SC_yes[] =	"YES";
-static sal_Char __READONLY_DATA sHTML_SC_no[] =		"NO";
-static sal_Char __READONLY_DATA sHTML_SC_auto[] =	"AUTO";
+static sal_Char const sHTML_SC_yes[] =	"YES";
+static sal_Char const sHTML_SC_no[] =		"NO";
+static sal_Char const sHTML_SC_auto[] =	"AUTO";
 
 #define HTML_O_READONLY "READONLY"
 #define HTML_O_EDIT 	"EDIT"
 
-static HTMLOptionEnum __READONLY_DATA aScollingTable[] =
+static HTMLOptionEnum const aScollingTable[] =
 {
     { sHTML_SC_yes,		ScrollingYes	},
     { sHTML_SC_no,		ScrollingNo	  	},
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 036f284..f7b597a 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -61,10 +61,10 @@
 
 using namespace ::com::sun::star;
 
-static sal_Char __READONLY_DATA sHTML_SC_yes[] =	"YES";
-static sal_Char __READONLY_DATA sHTML_SC_no[] =		"NO";
-static sal_Char __READONLY_DATA sHTML_SC_auto[] =	"AUTO";
-static sal_Char __READONLY_DATA sHTML_MIME_text_html[] =	"text/html; charset=";
+static sal_Char const sHTML_SC_yes[] =	"YES";
+static sal_Char const sHTML_SC_no[] =		"NO";
+static sal_Char const sHTML_SC_auto[] =	"AUTO";
+static sal_Char const sHTML_MIME_text_html[] =	"text/html; charset=";
 
 /* not used anymore?
 static HTMLOutEvent aFrameSetEventTable[] =
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 2d51d86..c0d97a0 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -63,7 +63,7 @@ sal_Char sHTML_MIME_application[] = "application/";
 sal_Char sHTML_MIME_experimental[] = "x-";
 
 // <INPUT TYPE=xxx>
-static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] =
+static HTMLOptionEnum const aAreaShapeOptEnums[] =
 {
     { OOO_STRING_SVTOOLS_HTML_SH_rect,		IMAP_OBJ_RECTANGLE	},
     { OOO_STRING_SVTOOLS_HTML_SH_rectangle,	IMAP_OBJ_RECTANGLE	},
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 60888fb..4adc4e4 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2125,12 +2125,12 @@ void SfxDispatcher::SetSlotFilter
 
     gezieltes disablen der Slots 1, 2 und 3:
 
-        static sal_uInt16 __READONLY_DATA pSIDs[] = { 1, 2, 3 };
+        static sal_uInt16 const pSIDs[] = { 1, 2, 3 };
         pDisp->SetSlotFilter( sal_False, sizeof(pSIDs)/sizeof(sal_uInt16), pSIDs );
 
     nur die Slots 5, 6 und 7 zulassen:
 
-        static sal_uInt16 __READONLY_DATA pSIDs[] = { 5, 6, 7 };
+        static sal_uInt16 const pSIDs[] = { 5, 6, 7 };
         pDisp->SetSlotFilter( sal_True, sizeof(pSIDs)/sizeof(sal_uInt16), pSIDs );
 
     Filter ausschalten:
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index b4bdacd..95afd8a 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -170,7 +170,7 @@ public:
 
 //=========================================================================
 
-sal_uInt16 __READONLY_DATA aTitleMap_Impl[3][2] =
+sal_uInt16 const aTitleMap_Impl[3][2] =
 {
                                 //	local				remote
     /*	SFX_TITLE_CAPTION	*/	{ 	SFX_TITLE_FILENAME, SFX_TITLE_TITLE },
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index aea8544..e3bf589 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -45,8 +45,8 @@
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
-sal_Char __READONLY_DATA sAudio[] = "audio";
-sal_Char __READONLY_DATA sVideo[] = "video";
+sal_Char const sAudio[] = "audio";
+sal_Char const sVideo[] = "video";
 
 /*************************************************************************
 |*
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 9fcfe5c..f6950d1 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -152,7 +152,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
 }
 void  SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 {
-    static USHORT __READONLY_DATA aLinesArr[] =
+    static USHORT const aLinesArr[] =
     {
         15, 10,
         20, 30,
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 911dff2..6a8344a 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1249,7 +1249,7 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
     return FALSE;
 }
 
-static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
+static USHORT const SvxUnoColorNameDefResId[] =
 {
     RID_SVXSTR_BLUEGREY_DEF,
     RID_SVXSTR_BLACK_DEF,
@@ -1280,7 +1280,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
     RID_SVXSTR_COLOR_CHART_DEF
 };
 
-static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
+static USHORT const SvxUnoColorNameResId[] =
 {
     RID_SVXSTR_BLUEGREY,
     RID_SVXSTR_BLACK,
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 8e48b01..f4fb0ae 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -75,12 +75,12 @@ using namespace ::rtl;
 using namespace ::xmloff::token;
 using namespace cppu;
 
-sal_Char __READONLY_DATA sXML_np__office[] = "__office";
-sal_Char __READONLY_DATA sXML_np__office_ooo[] = "___office";
-sal_Char __READONLY_DATA sXML_np__draw[] = "__draw";
-sal_Char __READONLY_DATA sXML_np__draw_ooo[] = "___draw";
-sal_Char __READONLY_DATA sXML_np__ooo[] = "__ooo";
-sal_Char __READONLY_DATA sXML_np__xlink[] = "__xlink";
+sal_Char const sXML_np__office[] = "__office";
+sal_Char const sXML_np__office_ooo[] = "___office";
+sal_Char const sXML_np__draw[] = "__draw";
+sal_Char const sXML_np__draw_ooo[] = "___draw";
+sal_Char const sXML_np__ooo[] = "__ooo";
+sal_Char const sXML_np__xlink[] = "__xlink";
 
 ///////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 359c743..0404fe8 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -171,7 +171,7 @@ BOOL XColorTable::Create()
     xub_StrLen nLen;
     ResMgr& rRes = DIALOG_MGR();
 
-    static USHORT __READONLY_DATA aResId[] =
+    static USHORT const aResId[] =
     {
         RID_SVXSTR_BLACK,
         RID_SVXSTR_BLUE,
@@ -200,7 +200,7 @@ BOOL XColorTable::Create()
 
     // BM: ifndef VCL part removed (deprecated)
 
-    static ColorData __READONLY_DATA aColTab[] =
+    static ColorData const aColTab[] =
     {
         COL_BLACK,
         COL_BLUE,
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 9f35e03..351a2fc 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -113,8 +113,8 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::io;
 using namespace ::xmloff::token;
 
-sal_Char __READONLY_DATA sXML_1_1[] = "1.1";
-sal_Char __READONLY_DATA sXML_1_2[] = "1.2";
+sal_Char const sXML_1_1[] = "1.1";
+sal_Char const sXML_1_2[] = "1.2";
 
 const sal_Char s_grddl_xsl[] =
     "http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl";
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 21f22af..2e24106 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -89,47 +89,47 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
 using namespace ::xmloff::token;
 
-sal_Char __READONLY_DATA sXML_np__office[] = "_office";
-sal_Char __READONLY_DATA sXML_np__office_ext[] = "_office_ooo";
-sal_Char __READONLY_DATA sXML_np__ooo[] = "_ooo";
-sal_Char __READONLY_DATA sXML_np__ooow[] = "_ooow";
-sal_Char __READONLY_DATA sXML_np__oooc[] = "_oooc";
-sal_Char __READONLY_DATA sXML_np__of[] = "_of";
-sal_Char __READONLY_DATA sXML_np__style[] = "_style";
-sal_Char __READONLY_DATA sXML_np__text[] = "_text";
-sal_Char __READONLY_DATA sXML_np__table[] = "_table";
-sal_Char __READONLY_DATA sXML_np__table_ext[] = "_table_ooo";
-sal_Char __READONLY_DATA sXML_np__draw[] = "_draw";
-sal_Char __READONLY_DATA sXML_np__draw_ext[] = "_draw_ooo";
-sal_Char __READONLY_DATA sXML_np__dr3d[] = "_dr3d";
-sal_Char __READONLY_DATA sXML_np__fo[] = "_fo";
-sal_Char __READONLY_DATA sXML_np__xlink[] = "_xlink";
-sal_Char __READONLY_DATA sXML_np__dc[] = "_dc";
-sal_Char __READONLY_DATA sXML_np__dom[] = "_dom";
-sal_Char __READONLY_DATA sXML_np__meta[] = "_meta";
-sal_Char __READONLY_DATA sXML_np__number[] = "_number";
-sal_Char __READONLY_DATA sXML_np__svg[] = "_svg";
-sal_Char __READONLY_DATA sXML_np__chart[] = "_chart";
-sal_Char __READONLY_DATA sXML_np__math[] = "_math";
-sal_Char __READONLY_DATA sXML_np__form[] = "_form";
-sal_Char __READONLY_DATA sXML_np__script[] = "_script";
-sal_Char __READONLY_DATA sXML_np__config[] = "_config";
-sal_Char __READONLY_DATA sXML_np__db[] = "_db";
-sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms";
-sal_Char __READONLY_DATA sXML_np__formx[] = "_formx";
-sal_Char __READONLY_DATA sXML_np__xsd[] = "_xsd";
-sal_Char __READONLY_DATA sXML_np__xsi[] = "_xsi";
-sal_Char __READONLY_DATA sXML_np__field[] = "_field";
-sal_Char __READONLY_DATA sXML_np__xhtml[] = "_xhtml";
-sal_Char __READONLY_DATA sXML_np__css3text[] = "_css3text";
-
-sal_Char __READONLY_DATA sXML_np__fo_old[] = "__fo";
-sal_Char __READONLY_DATA sXML_np__xlink_old[] = "__xlink";
-sal_Char __READONLY_DATA sXML_np__office_old[] = "__office";
-sal_Char __READONLY_DATA sXML_np__style_old[] = "__style";
-sal_Char __READONLY_DATA sXML_np__text_old[] = "__text";
-sal_Char __READONLY_DATA sXML_np__table_old[] = "__table";
-sal_Char __READONLY_DATA sXML_np__meta_old[] = "__meta";
+sal_Char const sXML_np__office[] = "_office";
+sal_Char const sXML_np__office_ext[] = "_office_ooo";
+sal_Char const sXML_np__ooo[] = "_ooo";
+sal_Char const sXML_np__ooow[] = "_ooow";
+sal_Char const sXML_np__oooc[] = "_oooc";
+sal_Char const sXML_np__of[] = "_of";
+sal_Char const sXML_np__style[] = "_style";
+sal_Char const sXML_np__text[] = "_text";
+sal_Char const sXML_np__table[] = "_table";
+sal_Char const sXML_np__table_ext[] = "_table_ooo";
+sal_Char const sXML_np__draw[] = "_draw";
+sal_Char const sXML_np__draw_ext[] = "_draw_ooo";
+sal_Char const sXML_np__dr3d[] = "_dr3d";
+sal_Char const sXML_np__fo[] = "_fo";
+sal_Char const sXML_np__xlink[] = "_xlink";
+sal_Char const sXML_np__dc[] = "_dc";
+sal_Char const sXML_np__dom[] = "_dom";
+sal_Char const sXML_np__meta[] = "_meta";
+sal_Char const sXML_np__number[] = "_number";
+sal_Char const sXML_np__svg[] = "_svg";
+sal_Char const sXML_np__chart[] = "_chart";
+sal_Char const sXML_np__math[] = "_math";
+sal_Char const sXML_np__form[] = "_form";
+sal_Char const sXML_np__script[] = "_script";
+sal_Char const sXML_np__config[] = "_config";
+sal_Char const sXML_np__db[] = "_db";
+sal_Char const sXML_np__xforms[] = "_xforms";
+sal_Char const sXML_np__formx[] = "_formx";
+sal_Char const sXML_np__xsd[] = "_xsd";
+sal_Char const sXML_np__xsi[] = "_xsi";
+sal_Char const sXML_np__field[] = "_field";
+sal_Char const sXML_np__xhtml[] = "_xhtml";
+sal_Char const sXML_np__css3text[] = "_css3text";
+
+sal_Char const sXML_np__fo_old[] = "__fo";
+sal_Char const sXML_np__xlink_old[] = "__xlink";
+sal_Char const sXML_np__office_old[] = "__office";
+sal_Char const sXML_np__style_old[] = "__style";
+sal_Char const sXML_np__text_old[] = "__text";
+sal_Char const sXML_np__table_old[] = "__table";
+sal_Char const sXML_np__meta_old[] = "__meta";
 
 
 
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 4057eea..33d9e99 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -65,7 +65,7 @@ using namespace ::xmloff::token;
 
 ///////////////////////////////////////////////////////////////////////
 
-SvXMLEnumMapEntry __READONLY_DATA aXML_EventActions_EnumMap[] =
+SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] =
 {
     { XML_NONE,			    ClickAction_NONE	},
     { XML_PREVIOUS_PAGE,	ClickAction_PREVPAGE },
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 4625426..c1317e9 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -573,7 +573,7 @@ SvXMLEnumMapEntry aXML_WritingMode_EnumMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAnimation_Enum[] =
 {
     { XML_NONE, 		drawing::TextAnimationKind_NONE	},
     { XML_BLINKING,	    drawing::TextAnimationKind_BLINK },	// will be filtered
@@ -583,7 +583,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Blinking_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAnimation_Blinking_Enum[] =
 {
     { XML_FALSE,		drawing::TextAnimationKind_NONE	},
     { XML_TRUE, 		drawing::TextAnimationKind_BLINK },
@@ -593,7 +593,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimation_Blinking_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimationDirection_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAnimationDirection_Enum[] =
 {
     { XML_LEFT,	    	drawing::TextAnimationDirection_LEFT },
     { XML_RIGHT,		drawing::TextAnimationDirection_RIGHT },	// will be filtered
@@ -602,7 +602,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAnimationDirection_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_TextAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_TextAlign_Enum[] =
 {
     { XML_LEFT,		    drawing::TextHorizontalAdjust_LEFT },
     { XML_CENTER,		drawing::TextHorizontalAdjust_CENTER },
@@ -611,7 +611,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_TextAlign_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
 {
     { XML_TOP,			drawing::TextVerticalAdjust_TOP },
     { XML_MIDDLE,		drawing::TextVerticalAdjust_CENTER },
@@ -620,7 +620,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
+SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
 {
     { XML_FALSE,		drawing::TextFitToSizeType_NONE },
     { XML_TRUE, 		drawing::TextFitToSizeType_PROPORTIONAL },
@@ -629,7 +629,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_MeasureUnit_Enum[] =
+SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] =
 {
     { XML_AUTOMATIC,	0 },
     { XML_UNIT_MM,		1 },
@@ -644,7 +644,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_MeasureUnit_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_HAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_Measure_HAlign_Enum[] =
 {
     { XML_AUTOMATIC,		drawing::MeasureTextHorzPos_AUTO },
     { XML_LEFT_OUTSIDE, 	drawing::MeasureTextHorzPos_LEFTOUTSIDE },
@@ -653,7 +653,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_HAlign_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_VAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_Measure_VAlign_Enum[] =
 {
     { XML_AUTOMATIC,	drawing::MeasureTextVertPos_AUTO },
     { XML_ABOVE,		drawing::MeasureTextVertPos_EAST },
@@ -663,7 +663,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Measure_VAlign_Enum[] =
 };
 
 // #FontWork#
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Style_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] =
 {
     { XML_ROTATE,		0 }, //XFT_ROTATE,
     { XML_UPRIGHT,		1 }, //XFT_UPRIGHT,
@@ -673,7 +673,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Style_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Adjust_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] =
 {
     { XML_LEFT, 		0 }, //XFT_LEFT,
     { XML_RIGHT,		1 }, //XFT_RIGHT,
@@ -682,7 +682,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Adjust_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Shadow_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] =
 {
     { XML_NORMAL,		0 }, //XFTSHADOW_NORMAL,
     { XML_SLANT,		1 }, //XFTSHADOW_SLANT,
@@ -690,7 +690,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Shadow_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Form_Enum[] =
+SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] =
 {
     { XML_NONE,			    0 }, //XFTFORM_NONE,
     { XML_TOPCIRCLE,		1 }, //XFTFORM_TOPCIRC,
@@ -708,7 +708,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Fontwork_Form_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Esc_Dir_Enum[] =
+SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] =
 {
     { XML_HORIZONTAL,		0 }, //SDRCAPT_ESCHORIZONTAL,
     { XML_VERTICAL,		    1 }, //SDRCAPT_ESCVERTICAL,
@@ -716,7 +716,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Esc_Dir_Enum[] =
     { XML_TOKEN_INVALID,0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Caption_Type_Enum[] =
+SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] =
 {
     { XML_STRAIGHT_LINE,			0 }, //SDRCAPT_TYPE1,
     { XML_ANGLED_LINE,				1 }, //SDRCAPT_TYPE2,
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 23be48c..3babd43 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -75,7 +75,7 @@ static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] =
     XML_TOKEN_MAP_END 
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_DashStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_DashStyle_Enum[] =
 {
     { XML_RECT,		    drawing::DashStyle_RECT },
     { XML_ROUND,		drawing::DashStyle_ROUND },
diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx
index 9c83351..1cef999 100644
--- a/xmloff/source/style/DrawAspectHdl.cxx
+++ b/xmloff/source/style/DrawAspectHdl.cxx
@@ -45,7 +45,7 @@ using namespace ::xmloff::token;
 // class XMLMeasurePropHdl
 //
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_DrawAspect_Enum[] =
+SvXMLEnumMapEntry const pXML_DrawAspect_Enum[] =
 {
     { XML_CONTENT,			1	},
     { XML_THUMBNAIL,		2	},
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index fc752bc..2f2f8d4 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -67,7 +67,7 @@ enum SvXMLTokenMapAttrs
 };
 
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_GradientStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] =
 {
     { XML_GRADIENTSTYLE_LINEAR,		    awt::GradientStyle_LINEAR },
     { XML_GRADIENTSTYLE_AXIAL,			awt::GradientStyle_AXIAL },
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index f1d3db0..d3e766a 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -59,7 +59,7 @@ enum SvXMLTokenMapAttrs
 };
 
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_HatchStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_HatchStyle_Enum[] =
 {
     { XML_HATCHSTYLE_SINGLE,	drawing::HatchStyle_SINGLE },
     { XML_HATCHSTYLE_DOUBLE,	drawing::HatchStyle_DOUBLE },
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index cfa15cd..7976729 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -63,7 +63,7 @@ enum SvXMLTokenMapAttrs
 };
 
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_GradientStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] =
 {
     { XML_GRADIENTSTYLE_LINEAR,		    awt::GradientStyle_LINEAR },
     { XML_GRADIENTSTYLE_AXIAL,			awt::GradientStyle_AXIAL },
diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index f909b8f..a1d0263 100644
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
@@ -42,7 +42,7 @@ using ::rtl::OUStringBuffer;
 
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Para_Adjust_Enum[] =
+SvXMLEnumMapEntry const pXML_Para_Adjust_Enum[] =
 {
     { XML_START,		style::ParagraphAdjust_LEFT },
     { XML_END,			style::ParagraphAdjust_RIGHT },
@@ -54,7 +54,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_Para_Adjust_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Para_Align_Last_Enum[] =
+SvXMLEnumMapEntry const pXML_Para_Align_Last_Enum[] =
 {
     { XML_START,		style::ParagraphAdjust_LEFT },
     { XML_CENTER,		style::ParagraphAdjust_CENTER },
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 7963dce..c640b65 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -157,13 +157,13 @@ SvXMLEnumMapEntry pXML_NamedBorderWidths[] =
     DEF_DOUBLE_LINE##n##_DIST
 
 
-static sal_uInt16 __READONLY_DATA aSBorderWidths[] =
+static sal_uInt16 const aSBorderWidths[] =
 {
     SBORDER_ENTRY( 0 ), SBORDER_ENTRY( 1 ), SBORDER_ENTRY( 2 ),
     SBORDER_ENTRY( 3 ), SBORDER_ENTRY( 4 )
 };
 
-static sal_uInt16 __READONLY_DATA aDBorderWidths[] =
+static sal_uInt16 const aDBorderWidths[] =
 {
     DBORDER_ENTRY( 0 ),
     DBORDER_ENTRY( 7 ),
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 4d4f1ea..de1864a 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -46,7 +46,7 @@ using namespace ::xmloff::token;
 
 const SvXMLEnumMapEntry* lcl_getFontFamilyGenericMapping()
 {
-    static SvXMLEnumMapEntry __READONLY_DATA aFontFamilyGenericMapping[] =
+    static SvXMLEnumMapEntry const aFontFamilyGenericMapping[] =
     {
         { XML_DECORATIVE,	    FAMILY_DECORATIVE },
 
@@ -60,7 +60,7 @@ const SvXMLEnumMapEntry* lcl_getFontFamilyGenericMapping()
     return aFontFamilyGenericMapping;
 }
 
-static SvXMLEnumMapEntry __READONLY_DATA aFontPitchMapping[] =
+static SvXMLEnumMapEntry const aFontPitchMapping[] =
 {
     { XML_FIXED,		    PITCH_FIXED		},
     { XML_VARIABLE,	        PITCH_VARIABLE	},
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index eaf58ba..07c4c97 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -42,7 +42,7 @@ using ::rtl::OUStringBuffer;
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry __READONLY_DATA aPostureGenericMapping[] =
+SvXMLEnumMapEntry const aPostureGenericMapping[] =
 {
     { XML_POSTURE_NORMAL,		ITALIC_NONE		},
     { XML_POSTURE_ITALIC,		ITALIC_NORMAL	},
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index a0c8cb0..edc1143 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -76,7 +76,7 @@ SvXMLEnumMapEntry aXML_ColorMode_EnumMap[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA aXML_HorizontalAdjust_Enum[] =
+SvXMLEnumMapEntry const aXML_HorizontalAdjust_Enum[] =
 {
     { XML_LEFT,	    text::HorizontalAdjust_LEFT },
     { XML_CENTER,	text::HorizontalAdjust_CENTER },
@@ -87,7 +87,7 @@ SvXMLEnumMapEntry __READONLY_DATA aXML_HorizontalAdjust_Enum[] =
 // aXML_WritingDirection_Enum is used with and without 'page'
 // attribute, so you'll find uses of aXML_WritingDirection_Enum
 // directly, as well as &(aXML_WritingDirection_Enum[1])
-SvXMLEnumMapEntry __READONLY_DATA aXML_WritingDirection_Enum[] =
+SvXMLEnumMapEntry const aXML_WritingDirection_Enum[] =
 {
     // aXML_WritingDirection_Enum
     { XML_PAGE,     text::WritingMode2::PAGE },
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index f0ff166..322dedc 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
 using namespace ::xmloff::token;
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_UnderlineType_Enum[] =
+SvXMLEnumMapEntry const pXML_UnderlineType_Enum[] =
 {
     { XML_NONE,							FontUnderline::NONE },
     { XML_SINGLE,		        FontUnderline::SINGLE },
@@ -67,7 +67,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_UnderlineType_Enum[] =
     { XML_TOKEN_INVALID,				0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_UnderlineStyle_Enum[] =
+SvXMLEnumMapEntry const pXML_UnderlineStyle_Enum[] =
 {
     { XML_NONE,							FontUnderline::NONE },
     { XML_SOLID,		        		FontUnderline::SINGLE },
@@ -90,7 +90,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_UnderlineStyle_Enum[] =
     { XML_TOKEN_INVALID,				0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_UnderlineWidth_Enum[] =
+SvXMLEnumMapEntry const pXML_UnderlineWidth_Enum[] =
 {
     { XML_AUTO,							FontUnderline::NONE },
     { XML_AUTO,		     			   	FontUnderline::SINGLE },
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 00e0a62..41df7a5 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -70,30 +70,30 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] = "SymbolTextDistance";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PARENT_NUMBERING[] = "ParentNumbering";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_CHAR_STYLE_NAME[] = "CharStyleName";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_CHAR[] = "BulletChar";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_RELSIZE[] = "BulletRelSize";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHIC_BITMAP[] = "GraphicBitmap";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHIC_SIZE[] = "GraphicSize";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_VERT_ORIENT[] = "VertOrient";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_HEADING_STYLE_NAME[] = "HeadingStyleName";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PREFIX[] = "Prefix";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SUFFIX[] = "Suffix";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_ADJUST[] = "Adjust";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LEFT_MARGIN[] = "LeftMargin";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] = "FirstLineOffset";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_START_WITH[] = "StartWith";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt";
+static sal_Char const XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] = "SymbolTextDistance";
+static sal_Char const XML_UNO_NAME_NRULE_PARENT_NUMBERING[] = "ParentNumbering";
+static sal_Char const XML_UNO_NAME_NRULE_CHAR_STYLE_NAME[] = "CharStyleName";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_CHAR[] = "BulletChar";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_RELSIZE[] = "BulletRelSize";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor";
+static sal_Char const XML_UNO_NAME_NRULE_GRAPHIC_BITMAP[] = "GraphicBitmap";
+static sal_Char const XML_UNO_NAME_NRULE_GRAPHIC_SIZE[] = "GraphicSize";
+static sal_Char const XML_UNO_NAME_NRULE_VERT_ORIENT[] = "VertOrient";
+static sal_Char const XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType";
+static sal_Char const XML_UNO_NAME_NRULE_HEADING_STYLE_NAME[] = "HeadingStyleName";
+static sal_Char const XML_UNO_NAME_NRULE_PREFIX[] = "Prefix";
+static sal_Char const XML_UNO_NAME_NRULE_SUFFIX[] = "Suffix";
+static sal_Char const XML_UNO_NAME_NRULE_ADJUST[] = "Adjust";
+static sal_Char const XML_UNO_NAME_NRULE_LEFT_MARGIN[] = "LeftMargin";
+static sal_Char const XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] = "FirstLineOffset";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont";
+static sal_Char const XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL";
+static sal_Char const XML_UNO_NAME_NRULE_START_WITH[] = "StartWith";
+static sal_Char const XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode";
+static sal_Char const XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy";
+static sal_Char const XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition";
+static sal_Char const XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent";
+static sal_Char const XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt";
 
 void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule,
                                              sal_Bool bOutline )
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index fcf90b9..0c4a237 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -85,34 +85,34 @@ using namespace ::com::sun::star::io;
 using rtl::OUString;
 using rtl::OUStringBuffer;
 
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] =
+static sal_Char const XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] =
         "SymbolTextDistance";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PARENT_NUMBERING[] =
+static sal_Char const XML_UNO_NAME_NRULE_PARENT_NUMBERING[] =
         "ParentNumbering";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_CHAR_STYLE_NAME[] =
+static sal_Char const XML_UNO_NAME_NRULE_CHAR_STYLE_NAME[] =
         "CharStyleName";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_CHAR[] ="BulletChar";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_RELSIZE[] = "BulletRelSize";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHIC_SIZE[] =
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_CHAR[] ="BulletChar";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_RELSIZE[] = "BulletRelSize";
+static sal_Char const XML_UNO_NAME_NRULE_GRAPHIC_SIZE[] =
         "GraphicSize";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_VERT_ORIENT[] ="VertOrient";
-
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PREFIX[] = "Prefix";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SUFFIX[] = "Suffix";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_ADJUST[] = "Adjust";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LEFT_MARGIN[] = "LeftMargin";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] =
+static sal_Char const XML_UNO_NAME_NRULE_VERT_ORIENT[] ="VertOrient";
+
+static sal_Char const XML_UNO_NAME_NRULE_NUMBERINGTYPE[] = "NumberingType";
+static sal_Char const XML_UNO_NAME_NRULE_PREFIX[] = "Prefix";
+static sal_Char const XML_UNO_NAME_NRULE_SUFFIX[] = "Suffix";
+static sal_Char const XML_UNO_NAME_NRULE_ADJUST[] = "Adjust";
+static sal_Char const XML_UNO_NAME_NRULE_LEFT_MARGIN[] = "LeftMargin";
+static sal_Char const XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET[] =
     "FirstLineOffset";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_START_WITH[] = "StartWith";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent";
-static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_FONT[] = "BulletFont";
+static sal_Char const XML_UNO_NAME_NRULE_GRAPHICURL[] = "GraphicURL";
+static sal_Char const XML_UNO_NAME_NRULE_START_WITH[] = "StartWith";
+static sal_Char const XML_UNO_NAME_NRULE_BULLET_COLOR[] = "BulletColor";
+static sal_Char const XML_UNO_NAME_NRULE_POSITION_AND_SPACE_MODE[] = "PositionAndSpaceMode";
+static sal_Char const XML_UNO_NAME_NRULE_LABEL_FOLLOWED_BY[] = "LabelFollowedBy";
+static sal_Char const XML_UNO_NAME_NRULE_LISTTAB_STOP_POSITION[] = "ListtabStopPosition";
+static sal_Char const XML_UNO_NAME_NRULE_FIRST_LINE_INDENT[] = "FirstLineIndent";
+static sal_Char const XML_UNO_NAME_NRULE_INDENT_AT[] = "IndentAt";
 
 // ---------------------------------------------------------------------
 
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index a5a7999..18cf0eb 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -228,7 +228,7 @@ const SvXMLTokenMap&
     return *pAttrTokenMap;
 }
 
-static SvXMLEnumMapEntry __READONLY_DATA aFootnoteNumberingMap[] =
+static SvXMLEnumMapEntry const aFootnoteNumberingMap[] =
 {
     { XML_PAGE,		        FootnoteNumbering::PER_PAGE },
     { XML_CHAPTER,		    FootnoteNumbering::PER_CHAPTER },
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 33c0e21..4dddabd 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -94,7 +94,7 @@ static const XMLTokenEnum aIndexSourceElementMap[] =
     XML_ILLUSTRATION_INDEX_SOURCE
 };
 
-SvXMLEnumMapEntry __READONLY_DATA aIndexTypeMap[] =
+SvXMLEnumMapEntry const aIndexTypeMap[] =
 {
     { XML_TABLE_OF_CONTENT,	    TEXT_INDEX_TOC },
     { XML_ALPHABETICAL_INDEX,	TEXT_INDEX_ALPHABETICAL },
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index 4ee2d9c..4cc8198 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -86,7 +86,7 @@ XMLIndexTableSourceContext::~XMLIndexTableSourceContext()
 {
 }
 
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] =
+static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] =
 {
     
     { XML_TEXT,			        ReferenceFieldPart::TEXT },
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index e4710c5..28f09c1 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -65,7 +65,7 @@ XMLLineNumberingExport::XMLLineNumberingExport(SvXMLExport& rExp)
 {
 }
 
-SvXMLEnumMapEntry __READONLY_DATA aLineNumberPositionMap[] =
+SvXMLEnumMapEntry const aLineNumberPositionMap[] =
 {
     { XML_LEFT,	    style::LineNumberPosition::LEFT },
     { XML_RIGHT,	style::LineNumberPosition::RIGHT },
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index dd60790..16c8b8c 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -393,7 +393,7 @@ void XMLSectionExport::ExportIndexHeaderStart(
 }
 
 
-SvXMLEnumStringMapEntry __READONLY_DATA aIndexTypeMap[] =
+SvXMLEnumStringMapEntry const aIndexTypeMap[] =
 {
     ENUM_STRING_MAP_ENTRY( "com.sun.star.text.ContentIndex", TEXT_SECTION_TYPE_TOC ),
     ENUM_STRING_MAP_ENTRY( "com.sun.star.text.DocumentIndex", TEXT_SECTION_TYPE_ALPHABETICAL ),
@@ -1159,7 +1159,7 @@ enum TemplateParamEnum
     TOK_TPARAM_BIBLIOGRAPHY_DATA
 };
 
-SvXMLEnumStringMapEntry __READONLY_DATA aTemplateTypeMap[] =
+SvXMLEnumStringMapEntry const aTemplateTypeMap[] =
 {
     ENUM_STRING_MAP_ENTRY( "TokenEntryNumber",  TOK_TTYPE_ENTRY_NUMBER ),
     ENUM_STRING_MAP_ENTRY( "TokenEntryText",    TOK_TTYPE_ENTRY_TEXT ),
@@ -1173,7 +1173,7 @@ SvXMLEnumStringMapEntry __READONLY_DATA aTemplateTypeMap[] =
     ENUM_STRING_MAP_END()
 };
 
-SvXMLEnumStringMapEntry __READONLY_DATA aTemplateParamMap[] =
+SvXMLEnumStringMapEntry const aTemplateParamMap[] =
 {
     ENUM_STRING_MAP_ENTRY( "TokenType",             TOK_TPARAM_TOKEN_TYPE ),
     ENUM_STRING_MAP_ENTRY( "CharacterStyleName",    TOK_TPARAM_CHAR_STYLE ),
@@ -1189,7 +1189,7 @@ SvXMLEnumStringMapEntry __READONLY_DATA aTemplateParamMap[] =
     ENUM_STRING_MAP_END()
 };
 
-SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataFieldMap[] =
+SvXMLEnumMapEntry const aBibliographyDataFieldMap[] =
 {
     { XML_ADDRESS,				BibliographyDataField::ADDRESS },
     { XML_ANNOTE,				BibliographyDataField::ANNOTE },
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 10e620a..9bacb70 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -88,7 +88,7 @@ static SvXMLTokenMapEntry aColSepAttrTokenMap[] =
     XML_TOKEN_MAP_END 
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Sep_Align_Enum[] =
+SvXMLEnumMapEntry const pXML_Sep_Align_Enum[] =
 {
     { XML_TOP,			VerticalAlignment_TOP	},
     { XML_MIDDLE,		VerticalAlignment_MIDDLE },
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 1337bc7..164c3da 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -128,7 +128,7 @@ enum lcl_MarkType { TypeReference, TypeReferenceStart, TypeReferenceEnd,
                     TypeFieldmark, TypeFieldmarkStart, TypeFieldmarkEnd
                   };
 
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] =
+static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] =
 {
     { XML_REFERENCE_MARK,			TypeReference },
     { XML_REFERENCE_MARK_START,	    TypeReferenceStart },
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index d824e6d..c5e0e30 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -94,77 +94,77 @@ using namespace ::com::sun::star::container;
 using namespace ::xmloff::token;
 
 
-static sal_Char __READONLY_DATA FIELD_SERVICE_SENDER[] = "ExtendedUser";
-static sal_Char __READONLY_DATA FIELD_SERVICE_AUTHOR[] = "Author";
-static sal_Char __READONLY_DATA FIELD_SERVICE_JUMPEDIT[] = "JumpEdit";
-static sal_Char __READONLY_DATA FIELD_SERVICE_GETEXP[] = "GetExpression";
-static sal_Char __READONLY_DATA FIELD_SERVICE_SETEXP[] = "SetExpression";
-static sal_Char __READONLY_DATA FIELD_SERVICE_USER[] = "User";
-static sal_Char __READONLY_DATA FIELD_SERVICE_INPUT[] = "Input";
-static sal_Char __READONLY_DATA FIELD_SERVICE_USERINPUT[] = "InputUser";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DATETIME[] = "DateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_PAGENUMBER[] = "PageNumber";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DB_DISPLAY[] = "Database";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DB_NAME[] = "DatabaseName";
-static sal_Char __READONLY_DATA FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText";
-static sal_Char __READONLY_DATA FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText";
-static sal_Char __READONLY_DATA FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision";
-static sal_Char __READONLY_DATA FIELD_SERVICE_FILE_NAME[] = "FileName";
-static sal_Char __READONLY_DATA FIELD_SERVICE_CHAPTER[] = "Chapter";
-static sal_Char __READONLY_DATA FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName";
-static sal_Char __READONLY_DATA FIELD_SERVICE_PAGE_COUNT[] = "PageCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_WORD_COUNT[] = "WordCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_TABLE_COUNT[] = "TableCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount";
-static sal_Char __READONLY_DATA FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet";
-static sal_Char __READONLY_DATA FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet";
-static sal_Char __READONLY_DATA FIELD_SERVICE_SHEET_NAME[] = "SheetName";
-static sal_Char __READONLY_DATA FIELD_SERVICE_MACRO[] = "Macro";
-static sal_Char __READONLY_DATA FIELD_SERVICE_GET_REFERENCE[] = "GetReference";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DDE[] = "DDE";
-static sal_Char __READONLY_DATA FIELD_SERVICE_URL[] = "URL";
-static sal_Char __READONLY_DATA FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography";
-static sal_Char __READONLY_DATA FIELD_SERVICE_SCRIPT[] = "Script";
-static sal_Char __READONLY_DATA FIELD_SERVICE_ANNOTATION[] = "Annotation";
-static sal_Char __READONLY_DATA FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters";
-static sal_Char __READONLY_DATA FIELD_SERVICE_META[] = "MetadataField";
-static sal_Char __READONLY_DATA FIELD_SERVICE_MEASURE[] = "Measure";
-static sal_Char __READONLY_DATA FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DROP_DOWN[] = "DropDown";
-
-SvXMLEnumStringMapEntry __READONLY_DATA aFieldServiceNameMapping[] =
+static sal_Char const FIELD_SERVICE_SENDER[] = "ExtendedUser";
+static sal_Char const FIELD_SERVICE_AUTHOR[] = "Author";
+static sal_Char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit";
+static sal_Char const FIELD_SERVICE_GETEXP[] = "GetExpression";
+static sal_Char const FIELD_SERVICE_SETEXP[] = "SetExpression";
+static sal_Char const FIELD_SERVICE_USER[] = "User";
+static sal_Char const FIELD_SERVICE_INPUT[] = "Input";
+static sal_Char const FIELD_SERVICE_USERINPUT[] = "InputUser";
+static sal_Char const FIELD_SERVICE_DATETIME[] = "DateTime";
+static sal_Char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber";
+static sal_Char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet";
+static sal_Char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet";
+static sal_Char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber";
+static sal_Char const FIELD_SERVICE_DB_DISPLAY[] = "Database";
+static sal_Char const FIELD_SERVICE_DB_NAME[] = "DatabaseName";
+static sal_Char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText";
+static sal_Char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText";
+static sal_Char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description";
+static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom";
+static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords";
+static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords";
+static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject";
+static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject";
+static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title";
+static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title";
+static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision";
+static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision";
+static sal_Char const FIELD_SERVICE_FILE_NAME[] = "FileName";
+static sal_Char const FIELD_SERVICE_CHAPTER[] = "Chapter";
+static sal_Char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName";
+static sal_Char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount";
+static sal_Char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount";
+static sal_Char const FIELD_SERVICE_WORD_COUNT[] = "WordCount";
+static sal_Char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount";
+static sal_Char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount";
+static sal_Char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount";
+static sal_Char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount";
+static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet";
+static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet";
+static sal_Char const FIELD_SERVICE_SHEET_NAME[] = "SheetName";
+static sal_Char const FIELD_SERVICE_MACRO[] = "Macro";
+static sal_Char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference";
+static sal_Char const FIELD_SERVICE_DDE[] = "DDE";
+static sal_Char const FIELD_SERVICE_URL[] = "URL";
+static sal_Char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography";
+static sal_Char const FIELD_SERVICE_SCRIPT[] = "Script";
+static sal_Char const FIELD_SERVICE_ANNOTATION[] = "Annotation";
+static sal_Char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters";
+static sal_Char const FIELD_SERVICE_META[] = "MetadataField";
+static sal_Char const FIELD_SERVICE_MEASURE[] = "Measure";
+static sal_Char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula";
+static sal_Char const FIELD_SERVICE_DROP_DOWN[] = "DropDown";
+
+SvXMLEnumStringMapEntry const aFieldServiceNameMapping[] =
 {
     ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SENDER, FIELD_ID_SENDER ),
     ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_AUTHOR, FIELD_ID_AUTHOR ),
@@ -2690,7 +2690,7 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName,
 }
 
 
-SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataTypeMap[] =
+SvXMLEnumMapEntry const aBibliographyDataTypeMap[] =
 {
     { XML_ARTICLE,			BibliographyDataType::ARTICLE },
     { XML_BOOK,			    BibliographyDataType::BOOK },
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 6705095..9413362 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -822,7 +822,7 @@ void XMLAuthorFieldImportContext::PrepareField(
 
 TYPEINIT1( XMLPageContinuationImportContext, XMLTextFieldImportContext );
 
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aSelectPageAttrMap[] =
+static SvXMLEnumMapEntry const lcl_aSelectPageAttrMap[] =
 {
     { XML_PREVIOUS, 	PageNumberType_PREV },
     { XML_CURRENT, 	    PageNumberType_CURRENT },
@@ -2878,7 +2878,7 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext(
 {
 }
 
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] =
+static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] =
 {
     { XML_PAGE, 		ReferenceFieldPart::PAGE},
     { XML_CHAPTER, 	    ReferenceFieldPart::CHAPTER },
@@ -3382,7 +3382,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext(
 }
 
 // TODO: this is the same map as is used in the text field export
-SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataTypeMap[] =
+SvXMLEnumMapEntry const aBibliographyDataTypeMap[] =
 {
     { XML_ARTICLE,			BibliographyDataType::ARTICLE },
     { XML_BOOK,			    BibliographyDataType::BOOK },
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 326eca4..82cb761 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -72,7 +72,7 @@ using namespace ::xmloff::token;
 
 // ---------------------------------------------------------------------------
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPos_Enum[] =
+SvXMLEnumMapEntry const pXML_HoriPos_Enum[] =
 {
     { XML_FROM_LEFT,		HoriOrientation::NONE	},
     { XML_FROM_INSIDE,		HoriOrientation::NONE	},	// import only
@@ -84,7 +84,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPos_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPosMirrored_Enum[] =
+SvXMLEnumMapEntry const pXML_HoriPosMirrored_Enum[] =
 {
     { XML_FROM_INSIDE,		HoriOrientation::NONE	},
     { XML_INSIDE,			HoriOrientation::LEFT	},
@@ -93,7 +93,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPosMirrored_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRel_Enum[] =
+SvXMLEnumMapEntry const pXML_HoriRel_Enum[] =
 {
     { XML_PARAGRAPH,			RelOrientation::FRAME	},
     { XML_PARAGRAPH_CONTENT,	RelOrientation::PRINT_AREA	},
@@ -111,7 +111,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRel_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRelFrame_Enum[] =
+SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] =
 {
     { XML_FRAME,				RelOrientation::FRAME	},
     { XML_FRAME_CONTENT,		RelOrientation::PRINT_AREA	},
@@ -125,7 +125,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRelFrame_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_HoriMirror_Enum[] =
+SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] =
 {
     { XML_FROM_LEFT,		sal_False	},
     { XML_FROM_INSIDE,		sal_True	},
@@ -137,7 +137,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriMirror_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VertPos_Enum[] =
+SvXMLEnumMapEntry const pXML_VertPos_Enum[] =
 {
     { XML_FROM_TOP,		    VertOrientation::NONE		},
     { XML_TOP,				VertOrientation::TOP		},
@@ -153,7 +153,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertPos_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VertPosAtChar_Enum[] =
+SvXMLEnumMapEntry const pXML_VertPosAtChar_Enum[] =
 {
     { XML_FROM_TOP,		    VertOrientation::NONE		},
     { XML_TOP,				VertOrientation::TOP		},
@@ -168,7 +168,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertPosAtChar_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VertRel_Enum[] =
+SvXMLEnumMapEntry const pXML_VertRel_Enum[] =
 {
     { XML_PARAGRAPH,			RelOrientation::FRAME	},
     { XML_PARAGRAPH_CONTENT,	RelOrientation::PRINT_AREA	},
@@ -183,7 +183,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRel_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelPage_Enum[] =
+SvXMLEnumMapEntry const pXML_VertRelPage_Enum[] =
 {
     { XML_PAGE,			RelOrientation::FRAME	},
     { XML_PAGE_CONTENT,	RelOrientation::PRINT_AREA	},
@@ -192,14 +192,14 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelPage_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelFrame_Enum[] =
+SvXMLEnumMapEntry const pXML_VertRelFrame_Enum[] =
 {
     { XML_FRAME,			RelOrientation::FRAME	},
     { XML_FRAME_CONTENT,	RelOrientation::PRINT_AREA	},
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelAsChar_Enum[] =
+SvXMLEnumMapEntry const pXML_VertRelAsChar_Enum[] =
 {
     { XML_BASELINE,		VertOrientation::TOP		},
     { XML_BASELINE,		VertOrientation::CENTER		},	// export only
@@ -213,7 +213,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelAsChar_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_RubyAdjust_Enum[] =
+SvXMLEnumMapEntry const pXML_RubyAdjust_Enum[] =
 {
     { XML_LEFT,				    RubyAdjust_LEFT },
     { XML_CENTER,				RubyAdjust_CENTER },
@@ -223,7 +223,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_RubyAdjust_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_FontRelief_Enum[] =
+SvXMLEnumMapEntry const pXML_FontRelief_Enum[] =
 {
     { XML_NONE,				FontRelief::NONE		},
     { XML_ENGRAVED,			FontRelief::ENGRAVED	},
@@ -231,7 +231,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FontRelief_Enum[] =
     { XML_TOKEN_INVALID, 0 }
 };
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
+SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
 {
     { XML_TOP,			ParagraphVertAlign::TOP		},
     { XML_MIDDLE,		ParagraphVertAlign::CENTER	},
@@ -242,7 +242,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] =
 };
 
 // OD 2004-05-05 #i28701#
-SvXMLEnumMapEntry __READONLY_DATA pXML_WrapInfluenceOnPosition_Enum[] =
+SvXMLEnumMapEntry const pXML_WrapInfluenceOnPosition_Enum[] =
 {
     // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#)
     { XML_ONCE_SUCCESSIVE, WrapInfluenceOnPosition::ONCE_SUCCESSIVE },
@@ -470,7 +470,7 @@ XMLParagraphOnlyPropHdl_Impl::~XMLParagraphOnlyPropHdl_Impl()
 
 // ---------------------------------------------------------------------------
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Wrap_Enum[] =
+SvXMLEnumMapEntry const pXML_Wrap_Enum[] =
 {
     { XML_NONE,		    WrapTextMode_NONE },
     { XML_RUN_THROUGH,	WrapTextMode_THROUGHT },
@@ -617,7 +617,7 @@ XMLFrameProtectPropHdl_Impl::~XMLFrameProtectPropHdl_Impl()
 
 // ---------------------------------------------------------------------------
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Anchor_Enum[] =
+SvXMLEnumMapEntry const pXML_Anchor_Enum[] =
 {
     { XML_CHAR,		    TextContentAnchorType_AT_CHARACTER },
     { XML_PAGE,	        TextContentAnchorType_AT_PAGE },
@@ -885,7 +885,7 @@ XMLGrfMirrorPropHdl_Impl::~XMLGrfMirrorPropHdl_Impl()
 
 // ---------------------------------------------------------------------------
 
-SvXMLEnumMapEntry __READONLY_DATA pXML_Emphasize_Enum[] =
+SvXMLEnumMapEntry const pXML_Emphasize_Enum[] =
 {
     { XML_NONE,	    FontEmphasis::NONE },
     { XML_DOT,		FontEmphasis::DOT_ABOVE },
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 4029d9a..8930e1d 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1250,7 +1250,7 @@ enum ValueType
     XML_VALUE_TYPE_BOOLEAN 
 };
 
-static SvXMLEnumMapEntry __READONLY_DATA aValueTypeMap[] = 
+static SvXMLEnumMapEntry const aValueTypeMap[] =
 {
     { XML_FLOAT, 		XML_VALUE_TYPE_FLOAT },
     { XML_CURRENCY, 	XML_VALUE_TYPE_CURRENCY },


More information about the Libreoffice-commits mailing list