[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect binfilter/inc filter/inc filter/source lotuswordpro/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Dec 12 00:19:14 PST 2010
binfilter/bf_sc/source/core/data/sc_docpool.cxx | 2
binfilter/bf_sc/source/ui/app/sc_msgpool.cxx | 2
binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx | 2
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx | 2
binfilter/bf_starmath/source/starmath_node.cxx | 2
binfilter/bf_starmath/source/starmath_rect.cxx | 2
binfilter/bf_starmath/source/starmath_unomodel.cxx | 2
binfilter/bf_starmath/source/starmath_utility.cxx | 2
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx | 2
binfilter/bf_svx/source/items/svx_svxfont.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unoprov.cxx | 4
binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx | 8
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 4
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 18 -
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx | 2
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 2
binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx | 2
binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx | 20 -
binfilter/bf_sw/source/core/swg/sw_rdnum.cxx | 4
binfilter/bf_sw/source/core/swg/sw_swgstr.cxx | 2
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 4
binfilter/bf_sw/source/filter/excel/sw_exctools.cxx | 2
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx | 10
binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx | 2
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 2
binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx | 2
binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx | 2
binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx | 48 +--
binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx | 30 +-
binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_postuhdl.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_prhdlfac.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_undlihdl.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx | 36 +-
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 36 +-
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLIndexTableSourceContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingExport.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx | 8
binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx | 124 +++++-----
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 6
binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx | 34 +-
binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx | 2
binfilter/binfilterdetect/source/bindetect.cxx | 4
binfilter/inc/bf_sw/iodetect.hxx | 4
filter/inc/filter/msfilter/msocximex.hxx | 2
filter/source/msfilter/msocximex.cxx | 58 ++--
filter/source/msfilter/svdfppt.cxx | 2
lotuswordpro/source/filter/schxmlwrapper.cxx | 2
70 files changed, 285 insertions(+), 285 deletions(-)
New commits:
commit 253ed4379e04ad47b898423b08c39071230c5285
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Dec 12 09:18:55 2010 +0100
change of __READONLY_DATA define to const
diff --git a/binfilter/bf_sc/source/core/data/sc_docpool.cxx b/binfilter/bf_sc/source/core/data/sc_docpool.cxx
index 8784d5b..85744d8 100644
--- a/binfilter/bf_sc/source/core/data/sc_docpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_docpool.cxx
@@ -88,7 +88,7 @@ namespace binfilter {
// ATTR_FONT_TWOLINES (not used) was changed to ATTR_USERDEF (not saved in binary format) in 641c
-/*N*/ static SfxItemInfo __READONLY_DATA aItemInfos[] =
+/*N*/ static SfxItemInfo const aItemInfos[] =
/*N*/ {
/*N*/ { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // ATTR_FONT
/*N*/ { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_HEIGHT
diff --git a/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx b/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx
index 7dcd4c6..3c887a6 100644
--- a/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_msgpool.cxx
@@ -41,7 +41,7 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ static SfxItemInfo __READONLY_DATA aMsgItemInfos[] =
+/*N*/ static SfxItemInfo const aMsgItemInfos[] =
/*N*/ {
/*N*/ { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING
/*N*/ { 0, SFX_ITEM_POOLABLE }, // SCITEM_SEARCHDATA - nicht mehr benutzt !!!
diff --git a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
index 04c97f2..a19b716 100644
--- a/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
+++ b/binfilter/bf_sch/source/filter/xml/sch_SchXMLWrapper.cxx
@@ -53,7 +53,7 @@
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
namespace binfilter {
-#define XML_STRING(i, x) sal_Char __READONLY_DATA i[sizeof(x)] = x
+#define XML_STRING(i, x) sal_Char const i[sizeof(x)] = x
#define MAP_LEN(x) x, sizeof(x) - 1
XML_STRING( sXML_metaStreamName, "meta.xml");
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index 0e3e164..2f8d4fb 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -89,7 +89,7 @@ using rtl::OUString;
#define MAP_LEN(x) x, sizeof(x) - 1
-#define XML_STRING(i, x) sal_Char __READONLY_DATA i[sizeof(x)] = x
+#define XML_STRING(i, x) sal_Char const i[sizeof(x)] = x
XML_STRING( sXML_metaStreamName, "meta.xml");
XML_STRING( sXML_styleStreamName, "styles.xml" );
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
index 8eb0837..5bef3b3 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appmain.cxx
@@ -106,7 +106,7 @@ static SfxPoolItem* aStaticDefaults[1] =
};
#ifdef TF_POOLABLE
-static SfxItemInfo __READONLY_DATA aItemInfos[] =
+static SfxItemInfo const aItemInfos[] =
{
{ 0, 0 }
};
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
index 316d2ae..0ed6d48 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
@@ -92,7 +92,7 @@ namespace binfilter {
//=========================================================================
-/*N*/ sal_uInt16 __READONLY_DATA aTitleMap_Impl[3][2] =
+/*N*/ sal_uInt16 const aTitleMap_Impl[3][2] =
/*N*/ {
/*N*/ // local remote
/*N*/ /* SFX_TITLE_CAPTION */ { SFX_TITLE_FILENAME, SFX_TITLE_TITLE },
diff --git a/binfilter/bf_starmath/source/starmath_node.cxx b/binfilter/bf_starmath/source/starmath_node.cxx
index 8e78c4d..98974a8 100644
--- a/binfilter/bf_starmath/source/starmath_node.cxx
+++ b/binfilter/bf_starmath/source/starmath_node.cxx
@@ -278,7 +278,7 @@ void SmNode::SetColor(const Color& rColor)
/*N*/ }
/*N*/
/*N*/ // check the requested size against maximum value
-/*N*/ static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128);
+/*N*/ static int const nMaxVal = SmPtsTo100th_mm(128);
/*N*/ if (aSize.Height() > nMaxVal)
/*?*/ aSize.Height() = nMaxVal;
/*N*/
diff --git a/binfilter/bf_starmath/source/starmath_rect.cxx b/binfilter/bf_starmath/source/starmath_rect.cxx
index 3fa9370..117a861 100644
--- a/binfilter/bf_starmath/source/starmath_rect.cxx
+++ b/binfilter/bf_starmath/source/starmath_rect.cxx
@@ -45,7 +45,7 @@ namespace binfilter {
// '\0' terminiertes Array mit Zeichen, die im StarMath Font als Buchstaben
// betrachtet werden sollen, (um im Gegensatz zu den anderen Operatoren
// und Symbolen ein "normales"(ungecliptes) SmRect zu erhalten).
-static xub_Unicode __READONLY_DATA aMathAlpha[] =
+static xub_Unicode const aMathAlpha[] =
{
MS_ALEPH, MS_IM, MS_RE,
MS_WP, xub_Unicode(0xE070), MS_EMPTYSET,
diff --git a/binfilter/bf_starmath/source/starmath_unomodel.cxx b/binfilter/bf_starmath/source/starmath_unomodel.cxx
index 9551226..8be506c 100644
--- a/binfilter/bf_starmath/source/starmath_unomodel.cxx
+++ b/binfilter/bf_starmath/source/starmath_unomodel.cxx
@@ -556,7 +556,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
sal_uInt32 nSize = aSequence.getLength();
SvMemoryStream aStream ( aSequence.getArray(), nSize, STREAM_READ );
aStream.Seek ( STREAM_SEEK_TO_BEGIN );
- static sal_uInt16 __READONLY_DATA nRange[] =
+ static sal_uInt16 const nRange[] =
{
SID_PRINTSIZE, SID_PRINTSIZE,
SID_PRINTZOOM, SID_PRINTZOOM,
diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx
index c793a20..8d76e88 100644
--- a/binfilter/bf_starmath/source/starmath_utility.cxx
+++ b/binfilter/bf_starmath/source/starmath_utility.cxx
@@ -374,7 +374,7 @@ int GetTextEncodingTabIndex( const String &rTxt, xub_StrLen nPos )
/*N*/ Size aSize (rSize);
/*N*/
/*N*/ // check the requested size against minimum value
-/*N*/ static int __READONLY_DATA nMinVal = SmPtsTo100th_mm(2);
+/*N*/ static int const nMinVal = SmPtsTo100th_mm(2);
/*N*/
/*N*/ if (aSize.Height() < nMinVal)
/*N*/ aSize.Height() = nMinVal;
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index 8103e73..d4a5e6d 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -130,7 +130,7 @@ struct PathToDefaultMapping_Impl
PathStrPtr _pDefaultPath;
};
-static PathToDefaultMapping_Impl __READONLY_DATA PathMap_Impl[] =
+static PathToDefaultMapping_Impl const PathMap_Impl[] =
{
{ SvtPathOptions::PATH_ADDIN, &SvtDefaultOptions_Impl::m_aAddinPath },
{ SvtPathOptions::PATH_AUTOCORRECT, &SvtDefaultOptions_Impl::m_aAutoCorrectPath },
diff --git a/binfilter/bf_svx/source/items/svx_svxfont.cxx b/binfilter/bf_svx/source/items/svx_svxfont.cxx
index 06603dd..e846163 100644
--- a/binfilter/bf_svx/source/items/svx_svxfont.cxx
+++ b/binfilter/bf_svx/source/items/svx_svxfont.cxx
@@ -50,7 +50,7 @@ namespace binfilter {
#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/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
index 52391dd..751c9fe 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoprov.cxx
@@ -1050,7 +1050,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,
@@ -1080,7 +1080,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_SUN_DEF
};
-static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
+static USHORT const SvxUnoColorNameResId[] =
{
RID_SVXSTR_BLUEGREY,
RID_SVXSTR_BLACK,
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index eab6785..6230b12 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -200,7 +200,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ xub_StrLen nLen;
/*N*/ ResMgr& rRes = DIALOG_MGR();
/*N*/
-/*N*/ static USHORT __READONLY_DATA aResId[] =
+/*N*/ static USHORT const aResId[] =
/*N*/ {
/*N*/ RID_SVXSTR_BLACK,
/*N*/ RID_SVXSTR_BLUE,
@@ -229,7 +229,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ // BM: ifndef VCL part removed (deprecated)
/*N*/
-/*N*/ static ColorData __READONLY_DATA aColTab[] =
+/*N*/ static ColorData const aColTab[] =
/*N*/ {
/*N*/ COL_BLACK,
/*N*/ COL_BLUE,
@@ -469,7 +469,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XubString& XColorTable::ConvertName( XubString& rStrName )
/*N*/ {
-/*N*/ static USHORT __READONLY_DATA aDefResId[] =
+/*N*/ static USHORT const aDefResId[] =
/*N*/ {
/*N*/ RID_SVXSTR_BLUEGREY_DEF,
/*N*/ RID_SVXSTR_BLACK_DEF,
@@ -498,7 +498,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ RID_SVXSTR_SEABLUE_DEF,
/*N*/ RID_SVXSTR_COLOR_SUN_DEF
/*N*/ };
-/*N*/ static USHORT __READONLY_DATA aResId[] =
+/*N*/ static USHORT const aResId[] =
/*N*/ {
/*N*/ RID_SVXSTR_BLUEGREY,
/*N*/ RID_SVXSTR_BLACK,
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index 4b59812..215618d 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -376,7 +376,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XubString& XDashList::ConvertName( XubString& rStrName )
/*N*/ {
-/*N*/ static USHORT __READONLY_DATA aDefResId[] =
+/*N*/ static USHORT const aDefResId[] =
/*N*/ {
/*N*/ RID_SVXSTR_DASH5_DEF,
/*N*/ RID_SVXSTR_DASH0_DEF,
@@ -390,7 +390,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ RID_SVXSTR_DASH9_DEF,
/*N*/ RID_SVXSTR_DASH10_DEF
/*N*/ };
-/*N*/ static USHORT __READONLY_DATA aResId[] =
+/*N*/ static USHORT const aResId[] =
/*N*/ {
/*N*/ RID_SVXSTR_DASH5,
/*N*/ RID_SVXSTR_DASH0,
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 4977348..07734ec 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -111,7 +111,7 @@ struct _CalcOp
SwCalcOper eOp;
};
-_CalcOp __READONLY_DATA aOpTable[] = {
+_CalcOp const aOpTable[] = {
/* ACOS */ {sCalc_Acos, CALC_ACOS}, // Arcuscosinus
/* ADD */ {sCalc_Add, CALC_PLUS}, // Addition
/* AND */ {sCalc_And, CALC_AND}, // log. und
@@ -142,13 +142,13 @@ _CalcOp __READONLY_DATA aOpTable[] = {
/* XOR */ {sCalc_Xor, CALC_XOR} // log. xoder
};
-double __READONLY_DATA nRoundVal[] = {
+double const nRoundVal[] = {
5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6,
0.5e-7, 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,
0.5e-15,0.5e-16
};
-double __READONLY_DATA nKorrVal[] = {
+double const nKorrVal[] = {
9, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7, 9e-8,
9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14
};
@@ -277,7 +277,7 @@ static int
/*N*/ sCurrSym.EraseLeadingChars().EraseTrailingChars();
/*N*/ pCharClass->toLower( sCurrSym );
/*N*/
-/*N*/ static sal_Char __READONLY_DATA
+/*N*/ static sal_Char const
/*N*/ sNType0[] = "false",
/*N*/ sNType1[] = "true",
/*N*/ sNType2[] = "pi",
@@ -308,7 +308,7 @@ static int
/*N*/ sNType26[] = "graph"
/*N*/ ;
/*N*/
-/*N*/ static const sal_Char* __READONLY_DATA sNTypeTab[ 27 ] =
+/*N*/ static const sal_Char* const sNTypeTab[ 27 ] =
/*N*/ {
/*N*/ sNType0, sNType1, sNType2, sNType3, sNType4, sNType5,
/*N*/ sNType6, sNType7, sNType8, sNType9, sNType10, sNType11,
@@ -319,25 +319,25 @@ static int
/*N*/ // diese sind mit doppelten HashIds
/*N*/ sNType25, sNType26
/*N*/ };
-/*N*/ static USHORT __READONLY_DATA aHashValue[ 27 ] =
+/*N*/ static USHORT const aHashValue[ 27 ] =
/*N*/ {
/*N*/ 34, 38, 43, 7, 18, 32, 22, 29, 30, 33, 3,
/*N*/ 28, 24, 40, 9, 11, 26, 45, 4, 23, 36, 44, 19, 5, 1,
/*N*/ // diese sind mit doppelten HashIds
/*N*/ 11, 38
/*N*/ };
-/*N*/ static USHORT __READONLY_DATA aAdrToken[ 12 ] =
+/*N*/ static USHORT const aAdrToken[ 12 ] =
/*N*/ {
/*N*/ POS_COMPANY, POS_STREET, POS_COUNTRY, POS_PLZ,
/*N*/ POS_CITY, POS_TITLE, POS_POSITION, POS_TEL_COMPANY,
/*N*/ POS_TEL_PRIVATE, POS_FAX, POS_EMAIL, POS_STATE
/*N*/ };
/*N*/
-/*N*/ static USHORT SwDocStat::* __READONLY_DATA aDocStat1[ 3 ] =
+/*N*/ static USHORT SwDocStat::* const aDocStat1[ 3 ] =
/*N*/ {
/*N*/ &SwDocStat::nTbl, &SwDocStat::nGrf, &SwDocStat::nOLE
/*N*/ };
-/*N*/ static ULONG SwDocStat::* __READONLY_DATA aDocStat2[ 4 ] =
+/*N*/ static ULONG SwDocStat::* const aDocStat2[ 4 ] =
/*N*/ {
/*N*/ &SwDocStat::nPage, &SwDocStat::nPara,
/*N*/ &SwDocStat::nWord, &SwDocStat::nChar
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index 2d509f6..c6d704a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -200,7 +200,7 @@ namespace binfilter {
/*N*/ // funktioniert nicht richtig, wenn man unterschiedliche WhichRanges hat.
/*N*/ /////////////// !!!!!!!!!!!!!!!!
/*N*/ //Die interressanten Attribute uebernehmen.
-/*N*/ USHORT __READONLY_DATA aIdArr[] = { RES_FRM_SIZE, RES_UL_SPACE,
+/*N*/ USHORT const aIdArr[] = { RES_FRM_SIZE, RES_UL_SPACE,
/*N*/ RES_BACKGROUND, RES_SHADOW,
/*N*/ RES_COL, RES_COL,
/*N*/ RES_FRAMEDIR, RES_FRAMEDIR,
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 930f5bd..3290499 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -164,7 +164,7 @@ struct ParaRstFmt
/*N*/ 0 );
/*N*/ SwAttrSet* pSet = pNode->GetpSwAttrSet();
/*N*/
-/*N*/ USHORT __READONLY_DATA aSavIds[ 3 ] = { RES_PAGEDESC, RES_BREAK,
+/*N*/ USHORT const aSavIds[ 3 ] = { RES_PAGEDESC, RES_BREAK,
/*N*/ RES_PARATR_NUMRULE };
/*N*/
/*N*/ const SfxPoolItem* pItem;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
index 8e9bd7c..8f9e41d 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
@@ -371,7 +371,7 @@ extern void ClearFEShellTabCols();
/*N*/ // Abstand zum Text
/*N*/ if (aSetBoxInfo.IsValid(VALID_DISTANCE))
/*N*/ {
-/*N*/ static USHORT __READONLY_DATA aBorders[] = {
+/*N*/ static USHORT const aBorders[] = {
/*N*/ BOX_LINE_BOTTOM, BOX_LINE_TOP,
/*N*/ BOX_LINE_RIGHT, BOX_LINE_LEFT };
/*N*/ const USHORT* pBrd = aBorders;
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index e2f0090..1a7bd95 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -1298,7 +1298,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, BYTE nMId )
/*?*/
/*?*/ if(nSubType == TYP_CONDTXTFLD)
/*?*/ {
-/*?*/ static char __READONLY_DATA cTmp[] = " : ";
+/*?*/ static char const cTmp[] = " : ";
/*?*/ aStr.AppendAscii(cTmp);
/*?*/ aStr += aFALSETxt;
/*?*/ }
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
index eee1c13..ace282f 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
@@ -466,7 +466,7 @@ void Sw3IoImp::InMacroTbl()
/*N*/ CloseFlagRec();
/*N*/
/*N*/ //JP 13.10.95: laut Changes-Mail von MI
-/*N*/ static sal_uInt16 __READONLY_DATA nRange[] =
+/*N*/ static sal_uInt16 const nRange[] =
/*N*/ {
/*N*/ FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
/*N*/ SID_HTML_MODE, SID_HTML_MODE,
diff --git a/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx b/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx
index 995b19b..c9082fb 100644
--- a/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx
@@ -44,7 +44,7 @@ using namespace ::rtl;
using namespace ::binfilter::xmloff::token;
#include <tools/debug.hxx> //STRIP001
namespace binfilter {
-sal_Char __READONLY_DATA sXML_np__block_list[] = "_block-list";
+sal_Char const sXML_np__block_list[] = "_block-list";
// #110680#
/*N*/ SwXMLSectionList::SwXMLSectionList(
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
index 27f4857..3a48922 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx
@@ -1112,7 +1112,7 @@ xub_StrLen InSWG_Nothing( SwSwgReader&, SfxItemSet*, SwTxtNode*, xub_StrLen, xub
typedef USHORT ( *SwHintFn )( SwSwgReader&, SfxItemSet*, SwTxtNode*, xub_StrLen, xub_StrLen );
-SwHintFn __READONLY_DATA aChrInAttrs[] =
+SwHintFn const aChrInAttrs[] =
{
/* OLDRES_CHRATR_CASEMAP */ InSWG_SvxCaseMapItem,
/* OLDRES_CHRATR_CHARWIDTH */ InSWG_Nothing,
@@ -1140,7 +1140,7 @@ SwHintFn __READONLY_DATA aChrInAttrs[] =
/* OLDRES_CHRATR_HARDBLANK */ InSWG_SwHardBlank,
};
-SwHintFn __READONLY_DATA aFontInAttrs[] =
+SwHintFn const aFontInAttrs[] =
{
/* OLDRES_TXTATR_CHARWIDTH */ InSWG_Nothing,
/* OLDRES_TXTATR_COLOR */ InSWG_SwColor,
@@ -1159,7 +1159,7 @@ SwHintFn __READONLY_DATA aFontInAttrs[] =
/* OLDRES_TXTATR_CHARFMT */ InSWG_SwCharFmt,
};
-SwHintFn __READONLY_DATA aEtcInAttrs[] =
+SwHintFn const aEtcInAttrs[] =
{
/* OLDRES_TXTATR_WRITINGDIRECTION */ InSWG_Nothing,
/* OLDRES_TXTATR_KERNING */ InSWG_SwKerning,
@@ -1179,7 +1179,7 @@ SwHintFn __READONLY_DATA aEtcInAttrs[] =
};
-static SwHintFn __READONLY_DATA aParInAttrs[] =
+static SwHintFn const aParInAttrs[] =
{
/* OLDRES_PARATR_LINESPACING */ InSWG_SwLineSpacing,
/* OLDRES_PARATR_FIRSTLINEOFFSET */ InSWG_Nothing, // nicht mehr da
@@ -1192,7 +1192,7 @@ static SwHintFn __READONLY_DATA aParInAttrs[] =
/* OLDRES_PARATR_DROP */ InSWG_SwDropCaps,
};
-static SwHintFn __READONLY_DATA aAddInAttrs[] =
+static SwHintFn const aAddInAttrs[] =
{
/* OLDRES_ADD_POSTIT */ InSWG_Nothing,
/* OLDRES_ADD_INSERTS */ InSWG_Nothing,
@@ -1200,7 +1200,7 @@ static SwHintFn __READONLY_DATA aAddInAttrs[] =
/* OLDRES_ADD_OTHERCONTENT */ InSWG_Nothing,
};
-static SwHintFn __READONLY_DATA aFrmInAttrs[] =
+static SwHintFn const aFrmInAttrs[] =
{
/* OLDRES_FILL_ORDER */ InSWG_SwFmtFillOrder,
/* OLDRES_FRM_SIZE */ InSWG_SwFmtFrmSize,
@@ -1231,7 +1231,7 @@ static SwHintFn __READONLY_DATA aFrmInAttrs[] =
/* OLDRES_COL */ InSWG_SwFmtCol
};
-static SwHintFn __READONLY_DATA aGrfInAttrs[] =
+static SwHintFn const aGrfInAttrs[] =
{
/* OLDRES_GRFATR_GRFSIZE */ InSWG_Nothing,
/* OLDRES_GRFATR_MIRRORGRF */ InSWG_SwMirrorGrf,
@@ -1251,9 +1251,9 @@ static struct HintFns
}
#if defined GCC || defined HPUX
;
-static __READONLY_DATA HintFns aHintFns[] =
+static const HintFns aHintFns[] =
#else
-__READONLY_DATA aHintFns[] =
+const aHintFns[] =
#endif
{
{ aChrInAttrs, OLDRES_CHRATR_BEGIN },
@@ -1266,7 +1266,7 @@ __READONLY_DATA aHintFns[] =
};
-static USHORT __READONLY_DATA nAttrSizes[] =
+static USHORT const nAttrSizes[] =
{
OLDRES_CHRATR_END + 1 - OLDRES_CHRATR_BEGIN,
OLDFONT_TXTATR_END - OLDFONT_TXTATR_BEGIN,
diff --git a/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx b/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx
index c19c31d..d5bcc45 100644
--- a/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_rdnum.cxx
@@ -169,8 +169,8 @@ SwNumRule* SwSwgReader::InNumRule()
{
if( aHdr.nVersion < SWG_VER_POOLID3 )
{
- static short __READONLY_DATA aOldFI[ 5 ] = { -227, -397, -567, -737, -936 };
- static short __READONLY_DATA aOldLft[ 5 ] = { 567, 964, 1474, 567*4, 3204 };
+ static short const aOldFI[ 5 ] = { -227, -397, -567, -737, -936 };
+ static short const aOldLft[ 5 ] = { 567, 964, 1474, 567*4, 3204 };
// Alte Dokumente: Fehlende Formate nachtragen
for( i = 0; i < MAXLEVEL; i++ )
diff --git a/binfilter/bf_sw/source/core/swg/sw_swgstr.cxx b/binfilter/bf_sw/source/core/swg/sw_swgstr.cxx
index f836f82..65203db 100644
--- a/binfilter/bf_sw/source/core/swg/sw_swgstr.cxx
+++ b/binfilter/bf_sw/source/core/swg/sw_swgstr.cxx
@@ -54,7 +54,7 @@ namespace binfilter {
{
// Dies sind Randomwerte, die konstant zur Verschluesselung
// des Passworts verwendet werden.
- static BYTE __READONLY_DATA cEncode[] =
+ static BYTE const cEncode[] =
{ 0xAB, 0x9E, 0x43, 0x05, 0x38, 0x12, 0x4d, 0x44,
0xD5, 0x7e, 0xe3, 0x84, 0x98, 0x23, 0x3f, 0xba };
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index ac2f9e3..f977245 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -966,7 +966,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ USHORT nLen;
/*N*/ USHORT nOffset;
/*N*/ FormTokenType eToken;
-/*N*/ } __READONLY_DATA aTokenArr[] = {
+/*N*/ } const aTokenArr[] = {
/*N*/ SwForm::aFormTab, SwForm::nFormEntryLen, 1, TOKEN_TAB_STOP,
/*N*/ SwForm::aFormPageNums, SwForm::nFormPageNumsLen, 1, TOKEN_PAGE_NUMS,
/*N*/ SwForm::aFormLinkStt, SwForm::nFormLinkSttLen, 1, TOKEN_LINK_START,
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index eb7c293..90d6219 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -1761,14 +1761,14 @@ void SwXFrame::attachToRange(const uno::Reference< XTextRange > & xTextRange)
SwNode& rNode = pDoc->GetNodes().GetEndOfContent();
SwPaM aPam(rNode);
aPam.Move( fnMoveBackward, fnGoDoc );
- static sal_uInt16 __READONLY_DATA aFrmAttrRange[] =
+ static sal_uInt16 const aFrmAttrRange[] =
{
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0
};
- static sal_uInt16 __READONLY_DATA aGrAttrRange[] =
+ static sal_uInt16 const aGrAttrRange[] =
{
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
0
diff --git a/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx b/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
index 713e1fa..271aef3 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_exctools.cxx
@@ -1224,7 +1224,7 @@ const SvxColorItem *ColorBuffer::GetColor( UINT16 nIndex )
{ // ausserhalb der Definierten
if( nIndex < DefColorSize )
{ // ... aber innerhalb der Defaults
- static BYTE __READONLY_DATA pDefArray[ DefColorSize ][ 3 ] = {
+ static BYTE const pDefArray[ DefColorSize ][ 3 ] = {
{ 0x00, 0x00, 0x00 },
{ 0xff, 0xff, 0xff },
{ 0xff, 0x00, 0x00 },
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index b1a71dd..327bc37 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -3487,7 +3487,7 @@ size_t Sw6Layout::PutRest(String &rStr,sal_Char *pCtrl)
if (TextBefehl("PA",&pCtrl[1]) ||
TextBefehl("CP",&pCtrl[1]))
{
- static sal_Char __READONLY_DATA p[2]={NewPage,'\0'};
+ static sal_Char const p[2]={NewPage,'\0'};
AddHForm(p,rStr.Len(),1);
}
else
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
index e7815b8..d2063ff 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
@@ -1492,7 +1492,7 @@ static Writer& OutW4W_SwTabStop( Writer& rWrt, const SfxPoolItem& rHt )
memset( aTabTypesArr, 0, 20 );
memset( aTabLeadingArr, 0, 40 );
// Umsetzungtabelle fuer das Adjustment
- static BYTE __READONLY_DATA aAdjustArr[ SVX_TAB_ADJUST_DEFAULT - SVX_TAB_ADJUST_LEFT +1 ] = {
+ static BYTE const aAdjustArr[ SVX_TAB_ADJUST_DEFAULT - SVX_TAB_ADJUST_LEFT +1 ] = {
/* SVX_TAB_ADJUST_LEFT */ 0,
/* SVX_TAB_ADJUST_RIGHT */ 2,
/* SVX_TAB_ADJUST_DECIMAL */ 3,
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
index f7378f5..f64bd43 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
@@ -2335,7 +2335,7 @@ void SwW4WParser::Read_NewTabTable() // (NTB)
SvxTabStopItem aTabStops( 0, 0 );
USHORT nTabPos = 0;
- static SvxTabAdjust __READONLY_DATA aAdjustArr[ 4 ] =
+ static SvxTabAdjust const aAdjustArr[ 4 ] =
{ SVX_TAB_ADJUST_LEFT, SVX_TAB_ADJUST_CENTER,
SVX_TAB_ADJUST_RIGHT, SVX_TAB_ADJUST_DECIMAL };
USHORT nTmp;
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index ce962a4..75408cc 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -1282,19 +1282,19 @@ USHORT SwW4WParser::Read_SetBorder( USHORT nBor, SvxBoxItem& rFmtBox )
// zumindest bei WP und WW2 nicht, d.h. "extra thick" und "hairline"
// wird nie benutzt. Ich habe die Tabelle jetzt auf WW2 optimiert.
- static USHORT __READONLY_DATA nOutTab[] = { // Aussenlinie :
+ static USHORT const nOutTab[] = { // Aussenlinie :
DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_1, // none, single
DEF_DOUBLE_LINE1_OUT, DEF_LINE_WIDTH_0, // double, dashed
DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_3, // dotted, sick
DEF_LINE_WIDTH_4, DEF_LINE_WIDTH_0 }; // extra thick, hairline
- static USHORT __READONLY_DATA nInTab[] = { // Innenlinie,
+ static USHORT const nInTab[] = { // Innenlinie,
0, 0, DEF_DOUBLE_LINE1_IN, 0, 0, 0, 0, 0 }; // Index siehe nOutTab
- static USHORT __READONLY_DATA nDistTab[] = { // Abstand der Linien
+ static USHORT const nDistTab[] = { // Abstand der Linien
0, 0, DEF_DOUBLE_LINE1_DIST, 0, 0, 0, 0, 0 }; // Index siehe nOutTab
- static USHORT __READONLY_DATA nLinePlace[] = { // Art der Linien
+ static USHORT const nLinePlace[] = { // Art der Linien
BOX_LINE_RIGHT,
BOX_LINE_BOTTOM,
BOX_LINE_LEFT,
@@ -3175,7 +3175,7 @@ void SwW4WParser::SetFtnInfoIntoDoc(BOOL bEndNote,
String& rPrefixTxt,
String& rSuffixTxt )
{
- static SvxExtNumType __READONLY_DATA aNumArr[]
+ static SvxExtNumType const aNumArr[]
= { SVX_NUM_ARABIC, SVX_NUM_ARABIC, SVX_NUM_CHARS_LOWER_LETTER, SVX_NUM_CHARS_UPPER_LETTER,
SVX_NUM_ROMAN_LOWER, SVX_NUM_ROMAN_UPPER };
if( bEndNote )
diff --git a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
index 65b6c6a..b040cbe 100644
--- a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
+++ b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
@@ -210,7 +210,7 @@ String* SwFldMgr::pTime = 0;
/*N*/ {
/*N*/ static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN;
/*N*/
-/*N*/ static USHORT __READONLY_DATA coFldNms[ coFldCnt ] = {
+/*N*/ static USHORT const coFldNms[ coFldCnt ] = {
/*N*/ FLD_DATE_STD,
/*N*/ FLD_TIME_STD,
/*N*/ STR_FILENAMEFLD,
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
index 1a40429..32f1395 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
@@ -344,7 +344,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
SvMemoryStream aStream (aSequence.getArray(), nSize,
STREAM_READ );
aStream.Seek ( STREAM_SEEK_TO_BEGIN );
- static sal_uInt16 __READONLY_DATA nRange[] =
+ static sal_uInt16 const nRange[] =
{
FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER,
SID_HTML_MODE, SID_HTML_MODE,
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx b/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx
index 00c7181..210a2a6 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx
@@ -54,7 +54,7 @@ namespace binfilter {
/*N*/ SfxMapUnit ePresMetric,
/*N*/ String &rText ) const
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char __READONLY_DATA sKomma[] = ", ";
+DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char const sKomma[] = ", ";
}
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx
index ab57866..43af2f4 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx
+++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx
@@ -57,7 +57,7 @@ extern sal_Bool bNoInterrupt; // in mainwn.cxx
/*N*/ void SwWrtShell::DrawSelChanged(SdrView* pView)
/*N*/ {
-//STRIP001 static sal_uInt16 __READONLY_DATA aInval[] =
+//STRIP001 static sal_uInt16 const aInval[] =
//STRIP001 /*N*/ {
//STRIP001 /*N*/ SID_ATTR_FILL_STYLE, SID_ATTR_FILL_COLOR, SID_ATTR_LINE_STYLE,
//STRIP001 /*N*/ SID_ATTR_LINE_WIDTH, SID_ATTR_LINE_COLOR, 0
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
index 2e4f820..eda9326 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx
@@ -91,7 +91,7 @@ using namespace ::binfilter::xmloff::token;
using rtl::OUString;
using rtl::OUStringBuffer;
-sal_Char __READONLY_DATA sXML_1_0[] = "1.0";
+sal_Char const sXML_1_0[] = "1.0";
#define LOGFILE_AUTHOR "mb93740"
diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
index e65b9d8..bfe8193 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmlimp.cxx
@@ -78,30 +78,30 @@ using namespace ::binfilter::xmloff::token;
using rtl::OUString;
-sal_Char __READONLY_DATA sXML_np__office[] = "_office";
-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__draw[] = "_draw";
-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__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__script[] = "_script";
-sal_Char __READONLY_DATA sXML_np__config[] = "_config";
-
-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__style[] = "_style";
+sal_Char const sXML_np__text[] = "_text";
+sal_Char const sXML_np__table[] = "_table";
+sal_Char const sXML_np__draw[] = "_draw";
+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__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__script[] = "_script";
+sal_Char const sXML_np__config[] = "_config";
+
+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";
#define LOGFILE_AUTHOR "mb93740"
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx b/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx
index 346c589..a9b589b 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_eventimp.cxx
@@ -68,7 +68,7 @@ using rtl::OUString;
///////////////////////////////////////////////////////////////////////
-SvXMLEnumMapEntry __READONLY_DATA aXML_EventActions_EnumMap[] =
+SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] =
{
{ XML_NONE, ClickAction_NONE },
{ XML_PREVIOUS_PAGE, ClickAction_PREVPAGE },
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index 8b15d1b..2df127d 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -548,7 +548,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
@@ -558,7 +558,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 },
@@ -568,7 +568,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
@@ -577,7 +577,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 },
@@ -586,7 +586,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 },
@@ -595,7 +595,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 },
@@ -604,7 +604,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 },
@@ -619,7 +619,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 },
@@ -628,7 +628,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 },
@@ -638,7 +638,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,
@@ -648,7 +648,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,
@@ -657,7 +657,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,
@@ -665,7 +665,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,
@@ -683,7 +683,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,
@@ -691,7 +691,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/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
index d00fea6..a0d4f7f 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
@@ -78,7 +78,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/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx
index 12ac779..71a3a9f 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_DrawAspectHdl.cxx
@@ -44,7 +44,7 @@ using namespace ::binfilter::xmloff::token;
// class XMLMeasurePropHdl
//
-SvXMLEnumMapEntry __READONLY_DATA pXML_DrawAspect_Enum[] =
+SvXMLEnumMapEntry const pXML_DrawAspect_Enum[] =
{
{ XML_CONTENT, 1 },
{ XML_THUMBNAIL, 2 },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
index bb9ec08..c028492 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
@@ -85,7 +85,7 @@ static SvXMLTokenMapEntry aGradientAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-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/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
index 543cee6..62d5a52 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
@@ -72,7 +72,7 @@ static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-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/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
index 44ebe13..f79bd98 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
@@ -79,7 +79,7 @@ static SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-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/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
index 7e53ead..5d96733 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_adjushdl.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::binfilter::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/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
index cd0461f..8a7389b 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
@@ -151,13 +151,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/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx
index cffe262..59201d8 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_fonthdl.cxx
@@ -44,7 +44,7 @@ using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::binfilter::xmloff::token;
-static SvXMLEnumMapEntry __READONLY_DATA aFontFamilyGenericMapping[] =
+static SvXMLEnumMapEntry const aFontFamilyGenericMapping[] =
{
{ XML_DECORATIVE, FAMILY_DECORATIVE },
@@ -56,7 +56,7 @@ static SvXMLEnumMapEntry __READONLY_DATA aFontFamilyGenericMapping[] =
{ XML_TOKEN_INVALID, 0 }
};
-static SvXMLEnumMapEntry __READONLY_DATA aFontPitchMapping[] =
+static SvXMLEnumMapEntry const aFontPitchMapping[] =
{
{ XML_FIXED, PITCH_FIXED },
{ XML_VARIABLE, PITCH_VARIABLE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_postuhdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_postuhdl.cxx
index 0e9ccb2..4ba7f0c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_postuhdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_postuhdl.cxx
@@ -44,7 +44,7 @@ using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::binfilter::xmloff::token;
-SvXMLEnumMapEntry __READONLY_DATA aPostureGenericMapping[] =
+SvXMLEnumMapEntry const aPostureGenericMapping[] =
{
{ XML_POSTURE_NORMAL, ITALIC_NONE },
{ XML_POSTURE_ITALIC, ITALIC_NORMAL },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_prhdlfac.cxx b/binfilter/bf_xmloff/source/style/xmloff_prhdlfac.cxx
index 8302777..59210b9 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_prhdlfac.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_prhdlfac.cxx
@@ -79,7 +79,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 },
@@ -90,7 +90,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/binfilter/bf_xmloff/source/style/xmloff_undlihdl.cxx b/binfilter/bf_xmloff/source/style/xmloff_undlihdl.cxx
index f01c71c..5fcc9ee 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_undlihdl.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_undlihdl.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
using namespace ::binfilter::xmloff::token;
-SvXMLEnumMapEntry __READONLY_DATA pXML_Underline_Enum[] =
+SvXMLEnumMapEntry const pXML_Underline_Enum[] =
{
{ XML_UNDERLINE_NONE, FontUnderline::NONE },
{ XML_UNDERLINE_SINGLE, FontUnderline::SINGLE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx
index c6a77b2..4dcca7d 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnume.cxx
@@ -66,25 +66,25 @@ using namespace ::binfilter::xmloff::token;
using rtl::OUString;
using rtl::OUStringBuffer;
-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_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_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_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 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";
void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::star::container::XIndexReplace > & xNumRule,
sal_Bool bOutline )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index befcdc6..8454160 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -68,29 +68,29 @@ 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 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";
// ---------------------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
index 6435c16..20c102a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
@@ -227,7 +227,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/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx
index 3e55c74..e8e4f1c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTOCContext.cxx
@@ -111,7 +111,7 @@ static const sal_Char* aIndexSourceElementMap[] =
sXML_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/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTableSourceContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTableSourceContext.cxx
index 369e339..d1fdbc4 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTableSourceContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexTableSourceContext.cxx
@@ -87,7 +87,7 @@ XMLIndexTableSourceContext::~XMLIndexTableSourceContext()
{
}
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] =
+static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] =
{
{ XML_TEXT, ReferenceFieldPart::TEXT },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingExport.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingExport.cxx
index fab6b8d..cc5e92f 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingExport.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLLineNumberingExport.cxx
@@ -69,7 +69,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/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx
index af94f35..5c1f40c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionExport.cxx
@@ -400,7 +400,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 ),
@@ -1155,7 +1155,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 ),
@@ -1169,7 +1169,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 ),
@@ -1182,7 +1182,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/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
index cdcb0bc..09480a6 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
@@ -82,7 +82,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/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx b/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx
index b11ee30..b38132b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextMarkImportContext.cxx
@@ -76,7 +76,7 @@ XMLTextMarkImportContext::XMLTextMarkImportContext(
enum lcl_MarkType { TypeReference, TypeReferenceStart, TypeReferenceEnd,
TypeBookmark, TypeBookmarkStart, TypeBookmarkEnd };
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] =
+static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] =
{
{ XML_REFERENCE_MARK, TypeReference },
{ XML_REFERENCE_MARK_START, TypeReferenceStart },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
index f1f28e2..56e3534 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtflde.cxx
@@ -118,67 +118,67 @@ using rtl::OUString;
using rtl::OUStringBuffer;
-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_DATE_TIME[] = "DocInfo.ChangeDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "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_DATE_TIME[] = "DocInfo.CreateDateTime";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_INFO0[] = "DocInfo.Info0";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_INFO1[] = "DocInfo.Info1";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_INFO2[] = "DocInfo.Info2";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_INFO3[] = "DocInfo.Info3";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "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_KEY_WORDS[] = "DocInfo.KeyWords";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title";
-static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_REVISION[] = "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_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_DATE_TIME[] = "DocInfo.ChangeDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_INFO0[] = "DocInfo.Info0";
+static sal_Char const FIELD_SERVICE_DOC_INFO_INFO1[] = "DocInfo.Info1";
+static sal_Char const FIELD_SERVICE_DOC_INFO_INFO2[] = "DocInfo.Info2";
+static sal_Char const FIELD_SERVICE_DOC_INFO_INFO3[] = "DocInfo.Info3";
+static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor";
+static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime";
+static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords";
+static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject";
+static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title";
+static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION[] = "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_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 ),
@@ -2505,7 +2505,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/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
index b6a4bb4..ec498d7 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
@@ -914,7 +914,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 },
@@ -2915,7 +2915,7 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext(
{
}
-static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] =
+static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] =
{
{ XML_PAGE, ReferenceFieldPart::PAGE},
{ XML_CHAPTER, ReferenceFieldPart::CHAPTER },
@@ -3422,7 +3422,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/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx
index e9ceb97..7a8be7d 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtprhdl.cxx
@@ -64,7 +64,7 @@ using namespace ::binfilter::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
@@ -76,7 +76,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 },
@@ -85,7 +85,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 },
@@ -103,7 +103,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 },
@@ -117,7 +117,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 },
@@ -129,7 +129,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 },
@@ -145,7 +145,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 },
@@ -160,7 +160,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 },
@@ -172,7 +172,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 },
@@ -181,14 +181,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
@@ -202,7 +202,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 },
@@ -212,7 +212,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 },
@@ -220,7 +220,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 },
@@ -449,7 +449,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 },
@@ -596,7 +596,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 },
@@ -861,7 +861,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/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx
index c3bc833..06ab13a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtvfldi.cxx
@@ -1242,7 +1242,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 },
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx b/binfilter/binfilterdetect/source/bindetect.cxx
index ed80bc9..c486dd4 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -460,8 +460,8 @@ bool checkFormat( SvStream* pStream, ::rtl::OUString& rTypeName, ::rtl::OUString
if ( bCheckAll || aName.equalsAsciiL( aFileTypeList[2].Type, aFileTypeList[2].Length ) )
{
// StarWriter DOS
- sal_Char __READONLY_DATA sSw6_FormatStt[] = ".\\\\\\ WRITER ";
- sal_Char __READONLY_DATA sSw6_FormatEnd[] = " \\\\\\";
+ sal_Char const sSw6_FormatStt[] = ".\\\\\\ WRITER ";
+ sal_Char const sSw6_FormatEnd[] = " \\\\\\";
if ( 0 == strncmp( sSw6_FormatStt, aBuffer, 12 ) &&
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index 8fe61e6..b78d214 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -259,8 +259,8 @@ const sal_Char* SwIoDetect::IsReader(const sal_Char* pHeader, ULONG nLen, \
} \
else if( sSwDos == pName ) \
{ \
- sal_Char __READONLY_DATA sSw6_FormatStt[] = ".\\\\\\ WRITER "; \
- sal_Char __READONLY_DATA sSw6_FormatEnd[] = " \\\\\\"; \
+ sal_Char const sSw6_FormatStt[] = ".\\\\\\ WRITER "; \
+ sal_Char const sSw6_FormatEnd[] = " \\\\\\"; \
\
bRet = 0 == strncmp( sSw6_FormatStt, pHeader, 12 ) && \
0 == strncmp( sSw6_FormatEnd, pHeader + 12 + 1, 4 ); \
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 345e29a..afc7811 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -308,7 +308,7 @@ protected:
sal_Int16 ImportSpecEffect( sal_uInt8 nSpecialEffect ) const;
sal_uInt8 ExportSpecEffect( sal_Int16 nApiEffect ) const;
static sal_uInt16 nStandardId;
- static sal_uInt8 __READONLY_DATA aObjInfo[4];
+ static sal_uInt8 const aObjInfo[4];
rtl::OUString msFormType;
rtl::OUString msDialogType;
OCX_Control* mpParent;
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 201cf52..3047c93 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -324,7 +324,7 @@ struct SortOrderByTabPos
};
-sal_uInt8 __READONLY_DATA OCX_Control::aObjInfo[4] = { 0x00, 0x12, 0x03, 0x00 };
+sal_uInt8 const OCX_Control::aObjInfo[4] = { 0x00, 0x12, 0x03, 0x00 };
long ReadAlign(SvStorageStream *pS, long nPos, int nAmount)
{
@@ -1725,7 +1725,7 @@ sal_Bool OCX_CommandButton::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x32, 0x05, 0xD7,
0x69, 0xCE, 0xCD, 0x11, 0xA7, 0x77, 0x00, 0xDD,
@@ -1756,7 +1756,7 @@ sal_Bool OCX_CommandButton::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x43, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x6D, 0x00,
0x61, 0x00, 0x6E, 0x00, 0x64, 0x00, 0x42, 0x00,
0x75, 0x00, 0x74, 0x00, 0x74, 0x00, 0x6F, 0x00,
@@ -1827,7 +1827,7 @@ sal_Bool OCX_ImageButton::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x32, 0x05, 0xD7,
0x69, 0xCE, 0xCD, 0x11, 0xA7, 0x77, 0x00, 0xDD,
@@ -1858,7 +1858,7 @@ sal_Bool OCX_ImageButton::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x43, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x6D, 0x00,
0x61, 0x00, 0x6E, 0x00, 0x64, 0x00, 0x42, 0x00,
0x75, 0x00, 0x74, 0x00, 0x74, 0x00, 0x6F, 0x00,
@@ -2186,7 +2186,7 @@ sal_Bool OCX_OptionButton::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x50, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -2217,7 +2217,7 @@ sal_Bool OCX_OptionButton::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x4F, 0x00, 0x70, 0x00, 0x74, 0x00, 0x69, 0x00,
0x6F, 0x00, 0x6E, 0x00, 0x42, 0x00, 0x75, 0x00,
0x74, 0x00, 0x74, 0x00, 0x6F, 0x00, 0x6E, 0x00,
@@ -2465,7 +2465,7 @@ sal_Bool OCX_TextBox::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x10, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -2495,7 +2495,7 @@ sal_Bool OCX_TextBox::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x54, 0x00, 0x65, 0x00, 0x78, 0x00, 0x74, 0x00,
0x42, 0x00, 0x6F, 0x00, 0x78, 0x00, 0x31, 0x00,
0x00, 0x00, 0x00, 0x00
@@ -2613,7 +2613,7 @@ sal_Bool OCX_FieldControl::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x10, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -2643,7 +2643,7 @@ sal_Bool OCX_FieldControl::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x54, 0x00, 0x65, 0x00, 0x78, 0x00, 0x74, 0x00,
0x42, 0x00, 0x6F, 0x00, 0x78, 0x00, 0x31, 0x00,
0x00, 0x00, 0x00, 0x00
@@ -2719,7 +2719,7 @@ sal_Bool OCX_ToggleButton::Export(
SvStorageRef &rObj, const uno::Reference< beans::XPropertySet> &rPropSet,
const awt::Size& rSize )
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x60, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -2750,7 +2750,7 @@ sal_Bool OCX_ToggleButton::Export(
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x54, 0x00, 0x6F, 0x00, 0x67, 0x00, 0x67, 0x00,
0x6C, 0x00, 0x65, 0x00, 0x42, 0x00, 0x75, 0x00,
0x74, 0x00, 0x74, 0x00, 0x6F, 0x00, 0x6E, 0x00,
@@ -3102,7 +3102,7 @@ sal_Bool OCX_ComboBox::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x30, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -3132,7 +3132,7 @@ sal_Bool OCX_ComboBox::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x43, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x62, 0x00,
0x6F, 0x00, 0x42, 0x00, 0x6F, 0x00, 0x78, 0x00,
0x31, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -3319,7 +3319,7 @@ sal_Bool OCX_ListBox::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x20, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -3349,7 +3349,7 @@ sal_Bool OCX_ListBox::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x4C, 0x00, 0x69, 0x00, 0x73, 0x00, 0x74, 0x00,
0x42, 0x00, 0x6F, 0x00, 0x78, 0x00, 0x31, 0x00,
0x00, 0x00, 0x00, 0x00
@@ -4168,7 +4168,7 @@ sal_Bool OCX_Label::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x23, 0x9E, 0x8C, 0x97,
0xB0, 0xD4, 0xCE, 0x11, 0xBF, 0x2D, 0x00, 0xAA,
@@ -4197,7 +4197,7 @@ sal_Bool OCX_Label::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x4C, 0x00, 0x61, 0x00, 0x62, 0x00, 0x65, 0x00,
0x6C, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00
};
@@ -4208,7 +4208,7 @@ sal_Bool OCX_Label::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor2.Is() && (SVSTREAM_OK == xStor2->GetError())),"damn");
}
/*
- static sal_uInt8 __READONLY_DATA aTest[] = {
+ static sal_uInt8 const aTest[] = {
0x00, 0x02, 0x20, 0x00, 0x2B, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00,
0x06, 0x00, 0x00, 0x80, 0x4C, 0x61, 0x62, 0x65,
@@ -4746,7 +4746,7 @@ sal_Bool OCX_CheckBox::Export(SvStorageRef &rObj,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x1D, 0xD2, 0x8B,
0x42, 0xEC, 0xCE, 0x11, 0x9E, 0x0D, 0x00, 0xAA,
@@ -4776,7 +4776,7 @@ sal_Bool OCX_CheckBox::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x43, 0x00, 0x68, 0x00, 0x65, 0x00, 0x63, 0x00,
0x6B, 0x00, 0x42, 0x00, 0x6F, 0x00, 0x78, 0x00,
0x31, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -4787,7 +4787,7 @@ sal_Bool OCX_CheckBox::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor2.Is() && (SVSTREAM_OK == xStor2->GetError())),"damn");
}
/*
- static sal_uInt8 __READONLY_DATA aTest[] = {
+ static sal_uInt8 const aTest[] = {
0x00, 0x02, 0x34, 0x00, 0x46, 0x01, 0xC0, 0x80,
0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00,
0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
@@ -5521,7 +5521,7 @@ sal_Bool OCX_Image::Export(SvStorageRef &rObj,
const uno::Reference< beans::XPropertySet > &rPropSet,
const awt::Size &rSize)
{
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x41, 0x92, 0x59, 0x4C,
0x26, 0x69, 0x1B, 0x10, 0x99, 0x92, 0x00, 0x00,
@@ -5550,7 +5550,7 @@ sal_Bool OCX_Image::Export(SvStorageRef &rObj,
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] = {
+ static sal_uInt8 const aOCXNAME[] = {
0x49, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x67, 0x00,
0x65, 0x00, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00
};
@@ -5716,7 +5716,7 @@ sal_Bool OCX_SpinButton::Export(
const uno::Reference< beans::XPropertySet>& rPropSet,
const awt::Size& rSize )
{
- static sal_uInt8 __READONLY_DATA aCompObj[] =
+ static sal_uInt8 const aCompObj[] =
{
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x6F, 0x17, 0x79,
@@ -5747,7 +5747,7 @@ sal_Bool OCX_SpinButton::Export(
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] =
+ static sal_uInt8 const aOCXNAME[] =
{
0x53, 0x00, 0x70, 0x00, 0x69, 0x00, 0x6E, 0x00,
0x42, 0x00, 0x75, 0x00, 0x74, 0x00, 0x74, 0x00,
@@ -5952,7 +5952,7 @@ sal_Bool OCX_ScrollBar::Export(
const uno::Reference< beans::XPropertySet>& rPropSet,
const awt::Size& rSize )
{
- static sal_uInt8 __READONLY_DATA aCompObj[] =
+ static sal_uInt8 const aCompObj[] =
{
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x81, 0xD1, 0xDF,
@@ -5983,7 +5983,7 @@ sal_Bool OCX_ScrollBar::Export(
DBG_ASSERT((xStor3.Is() && (SVSTREAM_OK == xStor3->GetError())),"damn");
}
- static sal_uInt8 __READONLY_DATA aOCXNAME[] =
+ static sal_uInt8 const aOCXNAME[] =
{
0x53, 0x00, 0x63, 0x00, 0x72, 0x00, 0x6F, 0x00,
0x6C, 0x00, 0x6C, 0x00, 0x42, 0x00, 0x61, 0x00,
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 16bbf18..0f70702 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6284,7 +6284,7 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >&
{
if ( nVal <= 3 )
{ // Absatzausrichtung
- static SvxAdjust __READONLY_DATA aAdj[ 4 ] = { SVX_ADJUST_LEFT, SVX_ADJUST_CENTER, SVX_ADJUST_RIGHT, SVX_ADJUST_BLOCK };
+ static SvxAdjust const aAdj[ 4 ] = { SVX_ADJUST_LEFT, SVX_ADJUST_CENTER, SVX_ADJUST_RIGHT, SVX_ADJUST_BLOCK };
rSet.Put( SvxAdjustItem( aAdj[ nVal ], EE_PARA_JUST ) );
}
}
diff --git a/lotuswordpro/source/filter/schxmlwrapper.cxx b/lotuswordpro/source/filter/schxmlwrapper.cxx
index a4a1f71..be6902e 100644
--- a/lotuswordpro/source/filter/schxmlwrapper.cxx
+++ b/lotuswordpro/source/filter/schxmlwrapper.cxx
@@ -134,7 +134,7 @@
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#endif
-#define XML_STRING(i, x) sal_Char __READONLY_DATA i[sizeof(x)] = x
+#define XML_STRING(i, x) sal_Char const i[sizeof(x)] = x
#define MAP_LEN(x) x, sizeof(x) - 1
XML_STRING( sXML_metaStreamName, "meta.xml");
More information about the Libreoffice-commits
mailing list