summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-12-12 10:15:19 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-12-12 10:15:19 +0100
commitb343ca0dfbae0731ac0ce89d14bc9c8fc667825d (patch)
tree88c26f50d5f2258b4b172a48e0c18f8fda1c3c6d /sw/source/filter
parent29f5b4f7f009491b6d9780f831455397e77aa626 (diff)
change of __READONLY_DATA define to const
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/htmlgrin.cxx2
-rw-r--r--sw/source/filter/html/svxcss1.cxx38
-rw-r--r--sw/source/filter/rtf/rtffld.cxx34
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/ww1/w1class.cxx2
-rw-r--r--sw/source/filter/ww1/w1filter.cxx2
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx4
-rw-r--r--sw/source/filter/ww8/dump/dump8a.cxx10
-rw-r--r--sw/source/filter/ww8/dump/ww8struc.hxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx12
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx6
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx8
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx2
15 files changed, 64 insertions, 64 deletions
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index ae837d9e158d..e9466a3347ee 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -765,7 +765,7 @@ IMAGE_SETEVENT:
{
const SvxMacro *pMacro;
- static USHORT __READONLY_DATA aEvents[] = {
+ static USHORT const aEvents[] = {
SFX_EVENT_MOUSEOVER_OBJECT,
SFX_EVENT_MOUSECLICK_OBJECT,
SFX_EVENT_MOUSEOUT_OBJECT,
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 7d194a0909e2..fbcd534357a5 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -76,7 +76,7 @@ SV_IMPL_PTRARR( CSS1Selectors, CSS1Selector* )
/* */
-static CSS1PropertyEnum __READONLY_DATA aFontSizeTable[] =
+static CSS1PropertyEnum const aFontSizeTable[] =
{
{ sCSS1_PV_xx_small, 0 },
{ sCSS1_PV_x_small, 1 },
@@ -88,7 +88,7 @@ static CSS1PropertyEnum __READONLY_DATA aFontSizeTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aFontFamilyTable[] =
+static CSS1PropertyEnum const aFontFamilyTable[] =
{
{ sCSS1_PV_serif, FAMILY_ROMAN },
{ sCSS1_PV_sans_serif, FAMILY_SWISS },
@@ -98,7 +98,7 @@ static CSS1PropertyEnum __READONLY_DATA aFontFamilyTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aFontWeightTable[] =
+static CSS1PropertyEnum const aFontWeightTable[] =
{
{ sCSS1_PV_extra_light, WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS)
{ sCSS1_PV_light, WEIGHT_NORMAL }, // WEIGHT_LIGHT (OBSOLETE)
@@ -113,7 +113,7 @@ static CSS1PropertyEnum __READONLY_DATA aFontWeightTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aFontStyleTable[] =
+static CSS1PropertyEnum const aFontStyleTable[] =
{
{ sCSS1_PV_normal, ITALIC_NONE },
{ sCSS1_PV_italic, ITALIC_NORMAL },
@@ -121,14 +121,14 @@ static CSS1PropertyEnum __READONLY_DATA aFontStyleTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aFontVariantTable[] =
+static CSS1PropertyEnum const aFontVariantTable[] =
{
{ sCSS1_PV_normal, SVX_CASEMAP_NOT_MAPPED },
{ sCSS1_PV_small_caps, SVX_CASEMAP_KAPITAELCHEN },
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aDirectionTable[] =
+static CSS1PropertyEnum const aDirectionTable[] =
{
{ sCSS1_PV_ltr, FRMDIR_HORI_LEFT_TOP },
{ sCSS1_PV_rtl, FRMDIR_HORI_RIGHT_TOP },
@@ -138,7 +138,7 @@ static CSS1PropertyEnum __READONLY_DATA aDirectionTable[] =
/* */
-static CSS1PropertyEnum __READONLY_DATA aBGRepeatTable[] =
+static CSS1PropertyEnum const aBGRepeatTable[] =
{
{ sCSS1_PV_repeat, GPOS_TILED },
{ sCSS1_PV_repeat_x, GPOS_TILED },
@@ -147,7 +147,7 @@ static CSS1PropertyEnum __READONLY_DATA aBGRepeatTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aBGHoriPosTable[] =
+static CSS1PropertyEnum const aBGHoriPosTable[] =
{
{ sCSS1_PV_left, GPOS_LT },
{ sCSS1_PV_center, GPOS_MT },
@@ -155,7 +155,7 @@ static CSS1PropertyEnum __READONLY_DATA aBGHoriPosTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aBGVertPosTable[] =
+static CSS1PropertyEnum const aBGVertPosTable[] =
{
{ sCSS1_PV_top, GPOS_LT },
{ sCSS1_PV_middle, GPOS_LM },
@@ -165,7 +165,7 @@ static CSS1PropertyEnum __READONLY_DATA aBGVertPosTable[] =
/* */
-static CSS1PropertyEnum __READONLY_DATA aTextAlignTable[] =
+static CSS1PropertyEnum const aTextAlignTable[] =
{
{ sCSS1_PV_left, SVX_ADJUST_LEFT },
{ sCSS1_PV_center, SVX_ADJUST_CENTER },
@@ -176,7 +176,7 @@ static CSS1PropertyEnum __READONLY_DATA aTextAlignTable[] =
/* */
-static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] =
+static CSS1PropertyEnum const aBorderWidthTable[] =
{
{ sCSS1_PV_thin, 0 }, // DEF_LINE_WIDTH_0 / DEF_DOUBLE_LINE0
{ sCSS1_PV_medium, 1 }, // DEF_LINE_WIDTH_1 / DEF_DOUBLE_LINE1
@@ -186,7 +186,7 @@ static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] =
enum CSS1BorderStyle { CSS1_BS_NONE, CSS1_BS_SINGLE, CSS1_BS_DOUBLE, CSS1_BS_DOTTED, CSS1_BS_DASHED };
-static CSS1PropertyEnum __READONLY_DATA aBorderStyleTable[] =
+static CSS1PropertyEnum const aBorderStyleTable[] =
{
{ sCSS1_PV_none, CSS1_BS_NONE },
{ sCSS1_PV_dotted, CSS1_BS_DOTTED },
@@ -200,7 +200,7 @@ static CSS1PropertyEnum __READONLY_DATA aBorderStyleTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aFloatTable[] =
+static CSS1PropertyEnum const aFloatTable[] =
{
{ sCSS1_PV_left, SVX_ADJUST_LEFT },
{ sCSS1_PV_right, SVX_ADJUST_RIGHT },
@@ -208,7 +208,7 @@ static CSS1PropertyEnum __READONLY_DATA aFloatTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aPositionTable[] =
+static CSS1PropertyEnum const aPositionTable[] =
{
{ sCSS1_PV_absolute, SVX_CSS1_POS_ABSOLUTE },
{ sCSS1_PV_relative, SVX_CSS1_POS_RELATIVE },
@@ -217,7 +217,7 @@ static CSS1PropertyEnum __READONLY_DATA aPositionTable[] =
};
// Feature: PrintExt
-static CSS1PropertyEnum __READONLY_DATA aSizeTable[] =
+static CSS1PropertyEnum const aSizeTable[] =
{
{ sCSS1_PV_auto, SVX_CSS1_STYPE_AUTO },
{ sCSS1_PV_landscape, SVX_CSS1_STYPE_LANDSCAPE },
@@ -225,7 +225,7 @@ static CSS1PropertyEnum __READONLY_DATA aSizeTable[] =
{ 0, 0 }
};
-static CSS1PropertyEnum __READONLY_DATA aPageBreakTable[] =
+static CSS1PropertyEnum const aPageBreakTable[] =
{
{ sCSS1_PV_auto, SVX_CSS1_PBREAK_AUTO },
{ sCSS1_PV_always, SVX_CSS1_PBREAK_ALWAYS },
@@ -259,13 +259,13 @@ static CSS1PropertyEnum __READONLY_DATA aPageBreakTable[] =
DEF_DOUBLE_LINE##n##_DIST
-static USHORT __READONLY_DATA aSBorderWidths[] =
+static USHORT const aSBorderWidths[] =
{
SBORDER_ENTRY( 0 ), SBORDER_ENTRY( 1 ), SBORDER_ENTRY( 2 ),
SBORDER_ENTRY( 3 ), SBORDER_ENTRY( 4 )
};
-static USHORT __READONLY_DATA aDBorderWidths[] =
+static USHORT const aDBorderWidths[] =
{
DBORDER_ENTRY( 0 ),
DBORDER_ENTRY( 7 ),
@@ -279,7 +279,7 @@ static USHORT __READONLY_DATA aDBorderWidths[] =
DBORDER_ENTRY( 5 )
};
-static USHORT __READONLY_DATA aTDBorderWidths[] =
+static USHORT const aTDBorderWidths[] =
{
TDBORDER_ENTRY( 7 ), TDBORDER_ENTRY( 8 ), TDBORDER_ENTRY( 9 ),
TDBORDER_ENTRY( 10 )
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index 441ab30ba9bf..95fcd48884ea 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -92,29 +92,29 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext )
{
// Strings sind PascalStrings; Laenge steht an 1. Stellen, dadurch wird
// sich der Aufruf von strlen erspart!!!
- sal_Char __READONLY_DATA sTOC[]= "\x03""toc";
- sal_Char __READONLY_DATA sIMPORT[]= "\x06""import";
- sal_Char __READONLY_DATA sINDEX[]= "\x05""index";
- sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol";
- sal_Char __READONLY_DATA sPAGE[]= "\x04""page";
- sal_Char __READONLY_DATA sNUMPAGES[]= "\x08""numpages";
- sal_Char __READONLY_DATA sDATE[]= "\x04""date";
- sal_Char __READONLY_DATA sTIME[]= "\x04""time";
- sal_Char __READONLY_DATA sDATA[]= "\x04""data";
- sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield";
- sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture";
- sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink";
- sal_Char __READONLY_DATA sREF[]= "\x03""ref";
- sal_Char __READONLY_DATA sPAGEREF[]= "\x07""pageref";
- sal_Char __READONLY_DATA sEQ[]= "\x02""eq";
- sal_Char __READONLY_DATA sINCLUDETEXT[]="\x0B""includetext";
+ sal_Char const sTOC[]= "\x03""toc";
+ sal_Char const sIMPORT[]= "\x06""import";
+ sal_Char const sINDEX[]= "\x05""index";
+ sal_Char const sSYMBOL[]= "\x06""symbol";
+ sal_Char const sPAGE[]= "\x04""page";
+ sal_Char const sNUMPAGES[]= "\x08""numpages";
+ sal_Char const sDATE[]= "\x04""date";
+ sal_Char const sTIME[]= "\x04""time";
+ sal_Char const sDATA[]= "\x04""data";
+ sal_Char const sMERGEFLD[]= "\x0A""mergefield";
+ sal_Char const sIMPORT2[]= "\x0E""includepicture";
+ sal_Char const sHYPERLINK[]= "\x09""hyperlink";
+ sal_Char const sREF[]= "\x03""ref";
+ sal_Char const sPAGEREF[]= "\x07""pageref";
+ sal_Char const sEQ[]= "\x02""eq";
+ sal_Char const sINCLUDETEXT[]="\x0B""includetext";
struct _Dummy_RTF_FLD_TYPES
{
RTF_FLD_TYPES eFldType;
const sal_Char* pFldNm;
};
- __READONLY_DATA _Dummy_RTF_FLD_TYPES aFldNmArr[RTFFLD_INCLUDETEXT + 1] = {
+ const _Dummy_RTF_FLD_TYPES aFldNmArr[RTFFLD_INCLUDETEXT + 1] = {
{RTFFLD_TOC, sTOC},
{RTFFLD_IMPORT, sIMPORT},
{RTFFLD_INDEX, sINDEX},
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index d7c1c7a6ca6c..cc209bf7882e 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -4221,7 +4221,7 @@ void SwRTFParser::UnknownAttrToken( int nToken, SfxItemSet* pSet )
void SwRTFParser::ReadInfo( const sal_Char* pChkForVerNo )
{
-sal_Char __READONLY_DATA aChkForVerNo[] = "StarWriter";
+sal_Char const aChkForVerNo[] = "StarWriter";
// falls nicht schon was vorgegeben wurde, setzen wir unseren Namen
// rein. Wenn das im Kommentar match, wird im Parser die VersionNummer
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 2e999b73c0e2..5e0ba3d439ae 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -118,7 +118,7 @@ USHORT Ww1Style::ReadName( BYTE*&p, USHORT& rnCountBytes, USHORT stc )
rnCountBytes--;
if( !nCountBytes ) // default
{
- static const sal_Char* __READONLY_DATA names[] =
+ static const sal_Char* const names[] =
{
"W1 Null", //222
"W1 Annotation reference", //223
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index d494d20b85e8..c76b2a83e0bb 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -483,7 +483,7 @@ static WWDateTime GetTimeDatePara( const String& rForm,
if( STRING_NOTFOUND != nDPos ) // Monat -> Datum ?
{
- static SwDateFormat __READONLY_DATA aDateA[32] =
+ static SwDateFormat const aDateA[32] =
{
DFF_DMY, DFF_DMMY, DFF_DMYY, DFF_DMMYY,
DFF_DMMMY, DFF_DMMMY, DFF_DMMMYY, DFF_DMMMYY,
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 920370622aee..d60eaaab5641 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -168,7 +168,7 @@ STOP1(Ww1SingleSprmPDxa, RES_LR_SPACE)
void Ww1SingleSprmPJc::Start(
Ww1Shell& rOut, BYTE, BYTE* pSprm, USHORT, Ww1Manager&)
{
- static SvxAdjust __READONLY_DATA aAdj[] = {
+ static SvxAdjust const aAdj[] = {
SVX_ADJUST_LEFT,
SVX_ADJUST_CENTER,
SVX_ADJUST_RIGHT,
@@ -297,7 +297,7 @@ void Ww1SingleSprmPBrc::Start(
STOP2(Ww1SingleSprmPBrc, RES_BOX, RES_SHADOW)
-static USHORT __READONLY_DATA nBrcTrans[BRC_ANZ] =
+static USHORT const nBrcTrans[BRC_ANZ] =
{ BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT };
void Ww1SingleSprmPBrc10::Start(
diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx
index fc4c065b718d..89321799f85a 100644
--- a/sw/source/filter/ww8/dump/dump8a.cxx
+++ b/sw/source/filter/ww8/dump/dump8a.cxx
@@ -1273,14 +1273,14 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen )
static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc )
{
- static int __READONLY_DATA WW8FkpSizeTabVer6[ PLCF_END ] = {
+ static int const WW8FkpSizeTabVer6[ PLCF_END ] = {
1, 7, 0 /*, 0, 0, 0*/ };
- static int __READONLY_DATA PlcSizeTabVer6[ PLCF_END+4 ] = {
+ static int const PlcSizeTabVer6[ PLCF_END+4 ] = {
2, 2, 12, 0, 2, 2, 20 };
- static int __READONLY_DATA WW8FkpSizeTabVer8[ PLCF_END ] = {
+ static int const WW8FkpSizeTabVer8[ PLCF_END ] = {
1, 13, 0 /*, 0, 0, 0*/ };
- static int __READONLY_DATA PlcSizeTabVer8[ PLCF_END+4 ] = {
+ static int const PlcSizeTabVer8[ PLCF_END+4 ] = {
4, 4, 12, 0, 2, 2, 30 };
const int* pFkpSizeTab;
@@ -2309,7 +2309,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst,
nCnt = 0;
}
- static char __READONLY_DATA sHex[17] = { "0123456789abcdef" };
+ static char const sHex[17] = { "0123456789abcdef" };
BYTE c;
*xTableStream >> c;
*pOut << sHex[ ( c & 0xf0 ) >> 4 ] << sHex[ c & 0x0f ] << ' ';
diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx
index 92797f9c6c64..58183817d597 100644
--- a/sw/source/filter/ww8/dump/ww8struc.hxx
+++ b/sw/source/filter/ww8/dump/ww8struc.hxx
@@ -254,7 +254,7 @@ struct WW8_BordersSO // fuer StarOffice-Border Code
*/
// Deklarationen gemaess BOXITEM.HXX
#define WW8_DECL_LINETAB_ARRAY \
- static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \
+ static WW8_BordersSO const nLineTabVer8[] = \
{ \
/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \
/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5afc60160121..6069ec53a0f0 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2838,7 +2838,7 @@ void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
{
OSL_TRACE("%s", OSL_THIS_FUNC);
- static USHORT __READONLY_DATA aBorders[] = {
+ static USHORT const aBorders[] = {
BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT };
static const sal_Char* aBorderNames[] = {
OOO_STRING_SVTOOLS_RTF_BRDRT, OOO_STRING_SVTOOLS_RTF_BRDRL, OOO_STRING_SVTOOLS_RTF_BRDRB, OOO_STRING_SVTOOLS_RTF_BRDRR };
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index eea153d284af..d64a810570bc 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -893,7 +893,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
//all links end up in the data stream as absolute references.
bool bAbsolute = !bBookMarkOnly;
- static BYTE __READONLY_DATA aURLData1[] = {
+ static BYTE const aURLData1[] = {
0,0,0,0, // len of struct
0x44,0, // the start of "next" data
0,0,0,0,0,0,0,0,0,0, // PIC-Structure!
@@ -902,7 +902,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // |
0,0,0,0, // /
};
- static BYTE __READONLY_DATA MAGIC_A[] = {
+ static BYTE const MAGIC_A[] = {
// start of "next" data
0xD0,0xC9,0xEA,0x79,0xF9,0xBA,0xCE,0x11,
0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B
@@ -927,13 +927,13 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
{
// version 1 (for a document)
- static BYTE __READONLY_DATA MAGIC_C[] = {
+ static BYTE const MAGIC_C[] = {
0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
0x00, 0x00
};
- static BYTE __READONLY_DATA MAGIC_D[] = {
+ static BYTE const MAGIC_D[] = {
0xFF, 0xFF, 0xAD, 0xDE, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -982,7 +982,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget )
// what the data mean, except for the URL.
// The First piece is the WW8_PIC structure.
//
- static BYTE __READONLY_DATA MAGIC_B[] = {
+ static BYTE const MAGIC_B[] = {
0xE0,0xC9,0xEA,0x79,0xF9,0xBA,0xCE,0x11,
0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B
};
@@ -2663,7 +2663,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
if ( pRedline->Next() )
Redline( pRedline->Next() );
- static USHORT __READONLY_DATA aSprmIds[ 2 * 2 * 3 ] =
+ static USHORT const aSprmIds[ 2 * 2 * 3 ] =
{
// Ids for insert
NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark, // for WW8
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index ab82a1ec8111..7f4649ee248f 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -573,12 +573,12 @@ void WW8Export::OutputOlst( const SwNumRule& rRule )
if ( bWrtWW8 )
return;
- static BYTE __READONLY_DATA aAnlvBase[] = { // Defaults
+ static BYTE const aAnlvBase[] = { // Defaults
1,0,0, // Upper Roman
0x0C, // Hanging Indent, fPrev
0,0,1,0x80,0,0,1,0,0x1b,1,0,0 };
- static BYTE __READONLY_DATA aSprmOlstHdr[] = { 133, 212 };
+ static BYTE const aSprmOlstHdr[] = { 133, 212 };
pO->Insert( aSprmOlstHdr, sizeof( aSprmOlstHdr ), pO->Count() );
WW8_OLST aOlst;
@@ -859,7 +859,7 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
BYTE nSwLevel )
{
- static BYTE __READONLY_DATA aSprmAnldDefault[54] = {
+ static BYTE const aSprmAnldDefault[54] = {
12, 52,
1,0,0,0x0c,0,0,1,0x80,0,0,1,0,0x1b,1,0,0,0x2e,
0,0,0,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 1ae7c7192cc3..259334045bac 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -478,7 +478,7 @@ void WW8AttributeOutput::DefaultStyle( USHORT nStyle )
{
if ( m_rWW8Export.bWrtWW8 )
{
- static BYTE __READONLY_DATA aDefCharSty[] = {
+ static BYTE const aDefCharSty[] = {
0x42, 0x00,
0x41, 0x40, 0xF2, 0xFF, 0xA1, 0x00, 0x42, 0x00,
0x00, 0x00, 0x19, 0x00, 0x41, 0x00, 0x62, 0x00,
@@ -493,7 +493,7 @@ void WW8AttributeOutput::DefaultStyle( USHORT nStyle )
}
else
{
- static BYTE __READONLY_DATA aDefCharSty[] = {
+ static BYTE const aDefCharSty[] = {
0x26, 0x00,
0x41, 0x40, 0xF2, 0xFF, 0xA1, 0x00, 0x26, 0x00,
0x19, 0x41, 0x62, 0x73, 0x61, 0x74, 0x7A, 0x2D,
@@ -554,7 +554,7 @@ void WW8AttributeOutput::StartStyles()
if ( m_rWW8Export.bWrtWW8 )
{
- static BYTE __READONLY_DATA aStShi[] = {
+ static BYTE const aStShi[] = {
0x12, 0x00,
0x0F, 0x00, 0x0A, 0x00, 0x01, 0x00, 0x5B, 0x00,
0x0F, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -564,7 +564,7 @@ void WW8AttributeOutput::StartStyles()
}
else
{
- static BYTE __READONLY_DATA aStShi[] = {
+ static BYTE const aStShi[] = {
0x0E, 0x00,
0x0F, 0x00, 0x08, 0x00, 0x01, 0x00, 0x4B, 0x00,
0x0F, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index a0466b751374..46e427e3be28 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -515,7 +515,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
{
WriteChar( (char)0x0d ); // umgebenden Rahmen mit CR abschliessen
- static BYTE __READONLY_DATA nSty[2] = { 0, 0 };
+ static BYTE const nSty[2] = { 0, 0 };
pO->Insert( nSty, 2, pO->Count() ); // Style #0
bool bOldGrf = bOutGrf;
bOutGrf = true;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index aa6ec08fcd70..aa473c0fd8d3 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1718,7 +1718,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
// einige Items koennen direkt so uebernommen werden
const USHORT nDirectMatch = 2;
- static RES_FRMATR __READONLY_DATA aDirectMatch[ nDirectMatch ] =
+ static RES_FRMATR const aDirectMatch[ nDirectMatch ] =
{
RES_LR_SPACE, // Aussenabstand links/rechts: SvxLRSpaceItem
RES_UL_SPACE // Aussenabstand Oben/unten: SvxULSpaceItem