[Libreoffice-commits] .: starmath/source sw/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Dec 12 01:15:36 PST 2010
starmath/source/dialog.cxx | 4 +-
starmath/source/mathtype.cxx | 4 +-
starmath/source/node.cxx | 2 -
starmath/source/rect.cxx | 2 -
starmath/source/unomodel.cxx | 2 -
starmath/source/utility.cxx | 2 -
sw/source/core/bastyp/calc.cxx | 18 ++++++-------
sw/source/core/doc/doc.cxx | 2 -
sw/source/core/doc/docdesc.cxx | 2 -
sw/source/core/doc/docfmt.cxx | 2 -
sw/source/core/docnode/ndtbl1.cxx | 4 +-
sw/source/core/fields/docufld.cxx | 2 -
sw/source/core/frmedt/feshview.cxx | 2 -
sw/source/core/swg/SwXMLBlockImport.cxx | 6 ++--
sw/source/core/swg/SwXMLSectionList.cxx | 4 +-
sw/source/core/text/frmcrsr.cxx | 2 -
sw/source/core/text/porfld.cxx | 2 -
sw/source/core/text/porrst.cxx | 2 -
sw/source/core/tox/tox.cxx | 2 -
sw/source/core/txtnode/fntcap.cxx | 2 -
sw/source/core/txtnode/swfont.cxx | 4 +-
sw/source/core/unocore/unoframe.cxx | 4 +-
sw/source/filter/html/htmlgrin.cxx | 2 -
sw/source/filter/html/svxcss1.cxx | 38 ++++++++++++++--------------
sw/source/filter/rtf/rtffld.cxx | 34 ++++++++++++-------------
sw/source/filter/rtf/swparrtf.cxx | 2 -
sw/source/filter/ww1/w1class.cxx | 2 -
sw/source/filter/ww1/w1filter.cxx | 2 -
sw/source/filter/ww1/w1sprm.cxx | 4 +-
sw/source/filter/ww8/dump/dump8a.cxx | 10 +++----
sw/source/filter/ww8/dump/ww8struc.hxx | 2 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 -
sw/source/filter/ww8/wrtw8nds.cxx | 12 ++++----
sw/source/filter/ww8/wrtw8num.cxx | 6 ++--
sw/source/filter/ww8/wrtw8sty.cxx | 8 ++---
sw/source/filter/ww8/wrtww8gr.cxx | 2 -
sw/source/filter/ww8/ww8graf.cxx | 2 -
sw/source/ui/app/appenv.cxx | 2 -
sw/source/ui/app/docsh2.cxx | 2 -
sw/source/ui/config/optpage.cxx | 2 -
sw/source/ui/dbui/dbinsdlg.cxx | 2 -
sw/source/ui/docvw/edtwin.cxx | 4 +-
sw/source/ui/envelp/envfmt.cxx | 2 -
sw/source/ui/fldui/fldmgr.cxx | 6 ++--
sw/source/ui/frmdlg/column.cxx | 2 -
sw/source/ui/ribbar/inputwin.cxx | 2 -
sw/source/ui/ribbar/workctrl.cxx | 4 +-
sw/source/ui/shells/basesh.cxx | 2 -
sw/source/ui/shells/beziersh.cxx | 4 +-
sw/source/ui/shells/drawdlg.cxx | 4 +-
sw/source/ui/shells/tabsh.cxx | 4 +-
sw/source/ui/shells/textsh.cxx | 2 -
sw/source/ui/uiview/pview.cxx | 20 +++++++-------
sw/source/ui/uiview/viewdraw.cxx | 2 -
sw/source/ui/uiview/viewport.cxx | 2 -
sw/source/ui/uiview/viewsrch.cxx | 2 -
sw/source/ui/uno/SwXDocumentSettings.cxx | 2 -
sw/source/ui/utlui/attrdesc.cxx | 2 -
sw/source/ui/wrtsh/wrtsh3.cxx | 2 -
59 files changed, 140 insertions(+), 140 deletions(-)
New commits:
commit ec25b99bfe0978f61f0b829f5c669a8c176764c0
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Dec 12 10:15:19 2010 +0100
change of __READONLY_DATA define to const
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index f5a2a81..35c595c 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -795,7 +795,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(NOCATEGORIES == 10, "Sm : array doesn't fit into the number of categories");
#endif
- ULONG __READONLY_DATA aCatMf2Hid[10][4] =
+ ULONG const aCatMf2Hid[10][4] =
{
{ HID_SMA_DEFAULT_DIST, HID_SMA_LINE_DIST, HID_SMA_ROOT_DIST, 0 },
{ HID_SMA_SUP_DIST, HID_SMA_SUB_DIST , 0, 0 },
@@ -810,7 +810,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
};
// array to help iterate over the controls
- Window * __READONLY_DATA aWin[4][2] =
+ Window * const aWin[4][2] =
{
{ &aFixedText1, &aMetricField1 },
{ &aFixedText2, &aMetricField2 },
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 90acfb7..1cc34d6 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1922,7 +1922,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium )
0x00,0x00,0x00,0x00,0x00,0x46 );
pStor->SetClass( aGName, 0, C2S("Microsoft Equation 3.0"));
- static sal_uInt8 __READONLY_DATA aCompObj[] = {
+ static sal_uInt8 const aCompObj[] = {
0x01, 0x00, 0xFE, 0xFF, 0x03, 0x0A, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0xCE, 0x02, 0x00,
0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
@@ -1940,7 +1940,7 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium )
SvStorageStreamRef xStor( pStor->OpenSotStream( C2S("\1CompObj")));
xStor->Write(aCompObj,sizeof(aCompObj));
- static sal_uInt8 __READONLY_DATA aOle[] = {
+ static sal_uInt8 const aOle[] = {
0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 073d12b..dec5ee7 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -299,7 +299,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
}
// check the requested size against maximum value
- static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128);
+ static int const nMaxVal = SmPtsTo100th_mm(128);
if (aFntSize.Height() > nMaxVal)
aFntSize.Height() = nMaxVal;
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index e484bba..5660fe6 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -49,7 +49,7 @@
// '\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/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 8f916da..c18400c 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -651,7 +651,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/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 8b078da..d815903 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -337,7 +337,7 @@ void SmFace::SetSize(const Size& rSize)
Size aSize (rSize);
// check the requested size against minimum value
- static int __READONLY_DATA nMinVal = SmPtsTo100th_mm(2);
+ static int const nMinVal = SmPtsTo100th_mm(2);
if (aSize.Height() < nMinVal)
aSize.Height() = nMinVal;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index a2a2a1f..afb58df 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/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
@@ -143,13 +143,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
};
@@ -292,7 +292,7 @@ SwCalc::SwCalc( SwDoc& rD )
sCurrSym.EraseLeadingChars().EraseTrailingChars();
pCharClass->toLower( sCurrSym );
-static sal_Char __READONLY_DATA
+static sal_Char const
sNType0[] = "false",
sNType1[] = "true",
sNType2[] = "pi",
@@ -323,7 +323,7 @@ static sal_Char __READONLY_DATA
sNType26[] = "graph"
;
-static const sal_Char* __READONLY_DATA sNTypeTab[ 27 ] =
+static const sal_Char* const sNTypeTab[ 27 ] =
{
sNType0, sNType1, sNType2, sNType3, sNType4, sNType5,
sNType6, sNType7, sNType8, sNType9, sNType10, sNType11,
@@ -334,25 +334,25 @@ static const sal_Char* __READONLY_DATA sNTypeTab[ 27 ] =
// diese sind mit doppelten HashIds
sNType25, sNType26
};
-static USHORT __READONLY_DATA aHashValue[ 27 ] =
+static USHORT const aHashValue[ 27 ] =
{
34, 38, 43, 7, 18, 32, 22, 29, 30, 33, 3,
28, 24, 40, 9, 11, 26, 45, 4, 23, 36, 44, 19, 5, 1,
// diese sind mit doppelten HashIds
11, 38
};
-static USHORT __READONLY_DATA aAdrToken[ 12 ] =
+static USHORT const aAdrToken[ 12 ] =
{
USER_OPT_COMPANY, USER_OPT_STREET, USER_OPT_COUNTRY, USER_OPT_ZIP,
USER_OPT_CITY, USER_OPT_TITLE, USER_OPT_POSITION, USER_OPT_TELEPHONEWORK,
USER_OPT_TELEPHONEHOME, USER_OPT_FAX, USER_OPT_EMAIL, USER_OPT_STATE
};
-static USHORT SwDocStat::* __READONLY_DATA aDocStat1[ 3 ] =
+static USHORT SwDocStat::* const aDocStat1[ 3 ] =
{
&SwDocStat::nTbl, &SwDocStat::nGrf, &SwDocStat::nOLE
};
-static ULONG SwDocStat::* __READONLY_DATA aDocStat2[ 4 ] =
+static ULONG SwDocStat::* const aDocStat2[ 4 ] =
{
&SwDocStat::nPage, &SwDocStat::nPara,
&SwDocStat::nWord, &SwDocStat::nChar
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 30f3985..1436f6e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1154,7 +1154,7 @@ static void lcl_FormatPostIt(
bool bNewPage, bool bIsFirstPostIt,
USHORT nPageNo, USHORT nLineNo )
{
- static char __READONLY_DATA sTmp[] = " : ";
+ static char const sTmp[] = " : ";
DBG_ASSERT( ViewShell::GetShellRes(), "missing ShellRes" );
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 997e4e6..b58e423 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -152,7 +152,7 @@ void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
// funktioniert nicht richtig, wenn man unterschiedliche WhichRanges hat.
/////////////// !!!!!!!!!!!!!!!!
//Die interressanten Attribute uebernehmen.
- USHORT __READONLY_DATA aIdArr[] = { RES_FRM_SIZE, RES_UL_SPACE,
+ USHORT const aIdArr[] = { RES_FRM_SIZE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
RES_COL, RES_COL,
RES_FRAMEDIR, RES_FRAMEDIR,
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 038388b..d87b32b 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -247,7 +247,7 @@ BOOL lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
const SfxPoolItem* pItem;
- USHORT __READONLY_DATA aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK, //->add by zhaojianwei
+ USHORT const aSavIds[ 4 ] = { RES_PAGEDESC, RES_BREAK, //->add by zhaojianwei
RES_PARATR_NUMRULE,
RES_PARATR_OUTLINELEVEL };
for( USHORT n = 0; n < 4; ++n ) //<-end,zhaojianwei
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 35d0cd1..057f3e6 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -775,7 +775,7 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
if( pSetBox )
{
- static USHORT __READONLY_DATA aBorders[] = {
+ static USHORT const aBorders[] = {
BOX_LINE_BOTTOM, BOX_LINE_TOP,
BOX_LINE_RIGHT, BOX_LINE_LEFT };
const USHORT* pBrd = aBorders;
@@ -1089,7 +1089,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
// Abstand zum Text
if (aSetBoxInfo.IsValid(VALID_DISTANCE))
{
- static USHORT __READONLY_DATA aBorders[] = {
+ static USHORT const aBorders[] = {
BOX_LINE_BOTTOM, BOX_LINE_TOP,
BOX_LINE_RIGHT, BOX_LINE_LEFT };
const USHORT* pBrd = aBorders;
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 144320a..2a4d6da 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1503,7 +1503,7 @@ String SwHiddenTxtField::GetCntnt(sal_Bool bName) const
if(nSubType == TYP_CONDTXTFLD)
{
-static char __READONLY_DATA cTmp[] = " : ";
+static char const cTmp[] = " : ";
aStr.AppendAscii(cTmp);
aStr += aFALSETxt;
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index fea7d35..f4ec878 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2481,7 +2481,7 @@ void SwFEShell::MirrorSelection( BOOL bHorizontal )
BOOL SwFEShell::GotoFly( const String& rName, FlyCntType eType, BOOL bSelFrm )
{
BOOL bRet = FALSE;
-static BYTE __READONLY_DATA aChkArr[ 4 ] = {
+static BYTE const aChkArr[ 4 ] = {
/* FLYCNTTYPE_ALL */ 0,
/* FLYCNTTYPE_FRM */ ND_TEXTNODE,
/* FLYCNTTYPE_GRF */ ND_GRFNODE,
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index b3e60d2..c464df9 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -38,9 +38,9 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token;
using ::rtl::OUString;
-sal_Char __READONLY_DATA sXML_np__block_list[] = "_block-list";
-sal_Char __READONLY_DATA sXML_np__office[] = "_ooffice";
-sal_Char __READONLY_DATA sXML_np__text[] = "_otext";
+sal_Char const sXML_np__block_list[] = "_block-list";
+sal_Char const sXML_np__office[] = "_ooffice";
+sal_Char const sXML_np__text[] = "_otext";
// #110680#
SwXMLBlockListImport::SwXMLBlockListImport(
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index d32852f..be7a4b6 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -39,8 +39,8 @@ using namespace ::com::sun::star;
using ::rtl::OUString;
using namespace ::xmloff::token;
-sal_Char __READONLY_DATA sXML_np__office[] = "_ooffice";
-sal_Char __READONLY_DATA sXML_np__text[] = "_otext";
+sal_Char const sXML_np__office[] = "_ooffice";
+sal_Char const sXML_np__text[] = "_otext";
// #110680#
SwXMLSectionList::SwXMLSectionList(
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 8c8296f..723fcf5 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1543,7 +1543,7 @@ void SwTxtFrm::FillCrsrPos( SwFillData& rFill ) const
SwTwips nSpace = 0;
if( FILL_TAB != rFill.Mode() )
{
-static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
+static sal_Char const sDoubleSpace[] = " ";
const XubString aTmp( sDoubleSpace, RTL_TEXTENCODING_MS_1252 );
SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTmp, 0, 2 );
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 6b7636c..e4d976d 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -771,7 +771,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const
if( bPaintSpace && nOldWidth > nSpaceOffs )
{
SwTxtPaintInfo aInf( rInf );
-static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
+static sal_Char const sDoubleSpace[] = " ";
aInf.X( aInf.X() + nSpaceOffs );
// --> FME 2005-08-12 #i53199# Adjust position of underline:
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 30941f3..0687b97 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -175,7 +175,7 @@ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const
if( rInf.GetFont()->IsPaintBlank() )
{
- static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
+ static sal_Char const sDoubleSpace[] = " ";
XubString aTxtDouble( sDoubleSpace, RTL_TEXTENCODING_MS_1252 );
// --> FME 2006-07-12 #b6439097#
SwRect aClipRect;
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 146166a..d16a3ef 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -891,7 +891,7 @@ FormTokenType SwFormTokensHelper::GetTokenType(const String & sToken,
USHORT nLen;
USHORT nOffset;
FormTokenType eToken;
- } __READONLY_DATA aTokenArr[] = {
+ } const aTokenArr[] = {
{ SwForm::aFormTab, SwForm::nFormEntryLen, 1, TOKEN_TAB_STOP },
{ SwForm::aFormPageNums, SwForm::nFormPageNumsLen, 1, TOKEN_PAGE_NUMS },
{ SwForm::aFormLinkStt, SwForm::nFormLinkSttLen, 1, TOKEN_LINK_START },
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index fb8025f..af8f8b5 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -330,7 +330,7 @@ void SwDoDrawCapital::Do()
void SwDoDrawCapital::DrawSpace( Point &rPos )
{
- static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
+ static sal_Char const sDoubleSpace[] = " ";
long nDiff = rInf.GetPos().X() - rPos.X();
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index e7f7620..b1f7e22 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -917,7 +917,7 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const BOOL bGrey )
if( pUnderFnt && nOldUnder != UNDERLINE_NONE )
{
-static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
+static sal_Char const sDoubleSpace[] = " ";
Size aFontSize = _GetTxtSize( rInf );
const XubString &rOldStr = rInf.GetText();
XubString aStr( sDoubleSpace, RTL_TEXTENCODING_MS_1252 );
@@ -1028,7 +1028,7 @@ void SwSubFont::_DrawStretchText( SwDrawTextInfo &rInf )
if( pUnderFnt && nOldUnder != UNDERLINE_NONE )
{
-static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
+static sal_Char const sDoubleSpace[] = " ";
const XubString &rOldStr = rInf.GetText();
XubString aStr( sDoubleSpace, RTL_TEXTENCODING_MS_1252 );
xub_StrLen nOldIdx = rInf.GetIdx();
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 8792183..011f7c7 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2012,14 +2012,14 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
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/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 6f0996d..702b7eb 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 99bda1d..cc236c2 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 0dd3f0a..a6fc730 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 7d7c8b9..e64e71d 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 2ed5235..e279b4f 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 9bf6a8b..a681eb1 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 67cc549..1b58e4a 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 46b90e8..3b50b72 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 c8ab5bd..32bb743 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 e2d450b..8ea30b8 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 eea153d..d64a810 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 129b628..076a26a 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 1ae7c71..2593340 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 a93c6cb..17672f3 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 1ac9223..5720af2 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
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 9c016b4..bf07daf 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -487,7 +487,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
if ( rItem.aAddrText.indexOf('<') >= 0 )
{
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{
SID_SBA_BRW_UPDATE,
SID_SBA_BRW_INSERT,
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index cc841a0..e24c3db 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1125,7 +1125,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
ToggleBrowserMode(bSet, 0);
// OS: numerische Reihenfolge beachten!
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{
SID_NEWWINDOW,/*5620*/
SID_BROWSER_MODE, /*6313*/
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e82fef5..db77fe8 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1218,7 +1218,7 @@ BOOL SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
if(pWrtShell && nsSelectionType::SEL_TBL & pWrtShell->GetSelectionType())
{
pWrtShell->SetTblChgMode(eMode);
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{ FN_TABLE_MODE_FIX,
FN_TABLE_MODE_FIX_PROP,
FN_TABLE_MODE_VARIABLE,
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index f766b41..313194d 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1483,7 +1483,7 @@ void SwInsertDBColAutoPilot::SetTabSet()
{
// die Defaults wieder entfernen, es macht keinen Sinn sie zu setzen
SvxBrushItem aBrush( RES_BACKGROUND );
- static USHORT __READONLY_DATA aIds[3] =
+ static USHORT const aIds[3] =
{ RES_BACKGROUND, SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE };
for( int i = 0; i < 3; ++i )
if( SFX_ITEM_SET == pTblSet->GetItemState( aIds[ i ],
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index b10c395..43b4305 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4404,7 +4404,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
rSh.Edit();
}
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{
SID_STYLE_WATERCAN,
SID_ATTR_CHAR_COLOR_EXT,
@@ -5322,7 +5322,7 @@ void SwEditWin::SetChainMode( BOOL bOn )
if ( !bChainMode )
rView.GetViewFrame()->HideStatusText();
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{
FN_FRAME_CHAIN, FN_FRAME_UNCHAIN, 0
};
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 2013265..827961a 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -352,7 +352,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
// Range ermitteln (Ranges beider Itemsets mergen)
const USHORT *pRanges = pColl->GetAttrSet().GetRanges();
- static USHORT __READONLY_DATA aRanges[] =
+ static USHORT const aRanges[] =
{
RES_PARATR_BEGIN, RES_PARATR_ADJUST,
RES_PARATR_TABSTOP, RES_PARATR_END-1,
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 38f99e1..e7ecd49 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -391,7 +391,7 @@ SwField* SwFldMgr::GetCurFld()
const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const
{
-static SwFldGroupRgn __READONLY_DATA aRanges[] =
+static SwFldGroupRgn const aRanges[] =
{
{ /* Document */ GRP_DOC_BEGIN, GRP_DOC_END },
{ /* Functions */ GRP_FKT_BEGIN, GRP_FKT_END },
@@ -400,7 +400,7 @@ static SwFldGroupRgn __READONLY_DATA aRanges[] =
{ /* Database */ GRP_DB_BEGIN, GRP_DB_END },
{ /* User */ GRP_VAR_BEGIN, GRP_VAR_END }
};
-static SwFldGroupRgn __READONLY_DATA aWebRanges[] =
+static SwFldGroupRgn const aWebRanges[] =
{
{ /* Document */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END },
{ /* Functions */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END },
@@ -1615,7 +1615,7 @@ void SwFieldType::_GetFldName()
{
static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN;
- static USHORT __READONLY_DATA coFldNms[ coFldCnt ] = {
+ static USHORT const coFldNms[ coFldCnt ] = {
FLD_DATE_STD,
FLD_TIME_STD,
STR_FILENAMEFLD,
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 2935530..224eafc 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -124,7 +124,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) :
nSelectionWidth = aRect.Width();
SfxItemSet* pColPgSet = 0;
- static USHORT __READONLY_DATA aSectIds[] = { RES_COL, RES_COL,
+ static USHORT const aSectIds[] = { RES_COL, RES_COL,
RES_FRM_SIZE, RES_FRM_SIZE,
RES_COLUMNBALANCE, RES_FRAMEDIR,
0 };
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index da01e1e..899e877 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -281,7 +281,7 @@ void SwInputWindow::ShowWin()
IMPL_LINK( SwInputWindow, MenuHdl, Menu *, pMenu )
{
-static const char * __READONLY_DATA aStrArr[] = {
+static const char * const aStrArr[] = {
sCalc_Phd,
sCalc_Sqrt,
sCalc_Or,
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 96fd64f..bac4704 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -351,7 +351,7 @@ void SwTbxAutoTextCtrl::DelPopup()
/* Navigations-Popup */
// determine the order of the toolbox items
-static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
+static USHORT const aNavigationInsertIds[ NAVI_ENTRIES ] =
{
// -- first line
NID_TBL,
@@ -376,7 +376,7 @@ static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
NID_TABLE_FORMULA_ERROR,
NID_NEXT
};
-static USHORT __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] =
+static USHORT const aNavigationHelpIds[ NAVI_ENTRIES ] =
{
// -- first line
HID_NID_TBL,
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index a40c951..3f8b26d 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -1921,7 +1921,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh )
}
else if( eMode == FLY_DRAG_END )
{
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_POSITION, SID_ATTR_SIZE, 0
};
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index 37ecf90..6e8d7a3 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -130,7 +130,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
case SID_BEZIER_INSERT:
{
GetView().GetEditWin().SetBezierMode(nSlotId);
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{
SID_BEZIER_INSERT,
SID_BEZIER_MOVE,
@@ -190,7 +190,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
{
pSdrView->SetMarkedPointsSmooth(eKind);
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{
SID_BEZIER_SMOOTH,
SID_BEZIER_EDGE,
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 6caa02e..021b3a9 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -112,7 +112,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), FALSE);
pSh->EndAction();
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_FILL_STYLE, SID_ATTR_FILL_COLOR, 0
};
@@ -151,7 +151,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), FALSE);
pSh->EndAction();
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_LINE_STYLE, SID_ATTR_LINE_WIDTH,
SID_ATTR_LINE_COLOR, 0
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 33c7ed3..2270691 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -429,7 +429,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
rSh.SetTableName( *pFmt, ((const SfxStringItem*)pItem)->GetValue() );
// kopiere die ausgesuchten Attribute in den ItemSet
- static USHORT __READONLY_DATA aIds[] =
+ static USHORT const aIds[] =
{
RES_PAGEDESC,
RES_BREAK,
@@ -1034,7 +1034,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
: TBLVAR_CHGABS ) );
SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
- static USHORT __READONLY_DATA aInva[] =
+ static USHORT const aInva[] =
{ FN_TABLE_MODE_FIX,
FN_TABLE_MODE_FIX_PROP,
FN_TABLE_MODE_VARIABLE,
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 7ae62b5..34ac457 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -597,7 +597,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
}
else
{
- static USHORT __READONLY_DATA aFrmAttrRange[] =
+ static USHORT const aFrmAttrRange[] =
{
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index a98ef6c..8fe9743 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -143,7 +143,7 @@ USHORT lcl_GetNextZoomStep(USHORT nCurrentZoom, BOOL bZoomIn)
void lcl_InvalidateZoomSlots(SfxBindings& rBindings)
{
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_ZOOM, SID_ZOOM_OUT, SID_ZOOM_IN, SID_ATTR_ZOOMSLIDER, FN_PREVIEW_ZOOM, FN_STAT_ZOOM,
0
@@ -281,7 +281,7 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol )
// Sortierung muss eingehalten werden!!
// OD 24.03.2003 #108282# - additional invalidate page status.
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_ZOOM, SID_ZOOM_OUT, SID_ZOOM_IN,
FN_PREVIEW_ZOOM,
@@ -393,7 +393,7 @@ int SwPagePreViewWin::MovePage( int eMoveMode )
mnSttPage = nNewSttPage;
// OD 24.03.2003 #108282# - additional invalidate page status.
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN,
FN_STAT_PAGE, 0
@@ -554,7 +554,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt )
mrView.SetVScrollbarThumbPos( nNewSelectedPage );
}
// OD 24.03.2003 #108282# - invalidate page status.
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_STAT_PAGE, 0
};
@@ -708,7 +708,7 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp,
}
ScrollViewSzChg();
// OD 24.03.2003 #108282# - additional invalidate page status.
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN,
FN_STAT_PAGE, 0
@@ -771,7 +771,7 @@ void SwPagePreView::Execute( SfxRequest &rReq )
// book preview mode changed. Thus, adjust scrollbars and
// invalidate corresponding states.
ScrollViewSzChg();
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN,
FN_STAT_PAGE, FN_SHOW_BOOKVIEW, 0
@@ -896,7 +896,7 @@ void SwPagePreView::Execute( SfxRequest &rReq )
}
GetViewShell()->ShowPreViewSelection( nNewSelectedPage );
// OD 24.03.2003 #108282# - invalidate page status.
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_STAT_PAGE, 0
};
@@ -1384,7 +1384,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar )
{
ScrollViewSzChg();
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT,
FN_PAGEUP, FN_PAGEDOWN, 0
@@ -1607,7 +1607,7 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar )
aViewWin.Scroll(nThmbPos - aViewWin.GetPaintedPreviewDocRect().Left(), 0);
}
// OD 24.03.2003 #108282# - additional invalidate page status.
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN,
FN_STAT_PAGE, 0
@@ -1763,7 +1763,7 @@ USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool )
rESh.SetModified();
rESh.EndAllAction();
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_LONG_ULSPACE, SID_ATTR_LONG_LRSPACE,
SID_RULER_BORDERS, SID_RULER_PAGE_POS, 0
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 014c4d6..71ccb88 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -347,7 +347,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
break;
}
- static sal_uInt16 __READONLY_DATA aInval[] =
+ static sal_uInt16 const aInval[] =
{
// Slot-Ids muessen beim Aufruf von Invalidate sortiert sein!
SID_ATTRIBUTES_AREA,
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 327049b..742513b 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -117,7 +117,7 @@ void lcl_GetPos(SwView* pView,
--------------------------------------------------------------------*/
void SwView::InvalidateRulerPos()
{
- static USHORT __READONLY_DATA aInval[] =
+ static USHORT const aInval[] =
{
SID_ATTR_PARA_LRSPACE, SID_RULER_BORDERS, SID_RULER_PAGE_POS,
SID_RULER_LR_MIN_MAX, SID_ATTR_LONG_ULSPACE, SID_ATTR_LONG_LRSPACE,
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 918e19e..b0879d9 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -639,7 +639,7 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions )
pWrtShell->SttSelect();
- static USHORT __READONLY_DATA aSearchAttrRange[] = {
+ static USHORT const aSearchAttrRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index d74a7e6..7d628ed 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -410,7 +410,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/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 2915af1..392c76f 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -78,7 +78,7 @@ void SwAttrSet::GetPresentation(
SfxMapUnit ePresMetric,
String &rText ) const
{
-static sal_Char __READONLY_DATA sKomma[] = ", ";
+static sal_Char const sKomma[] = ", ";
rText.Erase();
String aStr;
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 0bcb2f2..8db3c2f 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -126,7 +126,7 @@ bool SwWrtShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark)
void SwWrtShell::DrawSelChanged( )
{
- static sal_uInt16 __READONLY_DATA aInval[] =
+ static sal_uInt16 const aInval[] =
{
SID_ATTR_FILL_STYLE, SID_ATTR_FILL_COLOR, SID_ATTR_LINE_STYLE,
SID_ATTR_LINE_WIDTH, SID_ATTR_LINE_COLOR, 0
More information about the Libreoffice-commits
mailing list