summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-12-12 09:24:14 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-12-12 09:24:14 +0100
commitfb3c735cff5c4045bf938785bda1157d25910191 (patch)
tree739c8ad1c4b36b3dc903191e4cc8139d565a9498 /svx
parent18fad722e13066eb1b7280fe2f8707f83a0dc4e1 (diff)
change of __READONLY_DATA define to const
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/pfiledlg.cxx4
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx2
-rw-r--r--svx/source/unodraw/unoprov.cxx4
-rw-r--r--svx/source/xml/xmlxtimp.cxx12
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx4
5 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index aea8544a08..e3bf589514 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -45,8 +45,8 @@
using namespace ::rtl;
using namespace ::com::sun::star;
-sal_Char __READONLY_DATA sAudio[] = "audio";
-sal_Char __READONLY_DATA sVideo[] = "video";
+sal_Char const sAudio[] = "audio";
+sal_Char const sVideo[] = "video";
/*************************************************************************
|*
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 9fcfe5c053..f6950d1d4c 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -152,7 +152,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
}
void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
- static USHORT __READONLY_DATA aLinesArr[] =
+ static USHORT const aLinesArr[] =
{
15, 10,
20, 30,
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 911dff21a4..6a8344aa36 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1249,7 +1249,7 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
return FALSE;
}
-static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
+static USHORT const SvxUnoColorNameDefResId[] =
{
RID_SVXSTR_BLUEGREY_DEF,
RID_SVXSTR_BLACK_DEF,
@@ -1280,7 +1280,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_CHART_DEF
};
-static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
+static USHORT const SvxUnoColorNameResId[] =
{
RID_SVXSTR_BLUEGREY,
RID_SVXSTR_BLACK,
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 8e48b015df..f4fb0ae416 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -75,12 +75,12 @@ using namespace ::rtl;
using namespace ::xmloff::token;
using namespace cppu;
-sal_Char __READONLY_DATA sXML_np__office[] = "__office";
-sal_Char __READONLY_DATA sXML_np__office_ooo[] = "___office";
-sal_Char __READONLY_DATA sXML_np__draw[] = "__draw";
-sal_Char __READONLY_DATA sXML_np__draw_ooo[] = "___draw";
-sal_Char __READONLY_DATA sXML_np__ooo[] = "__ooo";
-sal_Char __READONLY_DATA sXML_np__xlink[] = "__xlink";
+sal_Char const sXML_np__office[] = "__office";
+sal_Char const sXML_np__office_ooo[] = "___office";
+sal_Char const sXML_np__draw[] = "__draw";
+sal_Char const sXML_np__draw_ooo[] = "___draw";
+sal_Char const sXML_np__ooo[] = "__ooo";
+sal_Char const sXML_np__xlink[] = "__xlink";
///////////////////////////////////////////////////////////////////////
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 359c7434fe..0404fe8825 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -171,7 +171,7 @@ BOOL XColorTable::Create()
xub_StrLen nLen;
ResMgr& rRes = DIALOG_MGR();
- static USHORT __READONLY_DATA aResId[] =
+ static USHORT const aResId[] =
{
RID_SVXSTR_BLACK,
RID_SVXSTR_BLUE,
@@ -200,7 +200,7 @@ BOOL XColorTable::Create()
// BM: ifndef VCL part removed (deprecated)
- static ColorData __READONLY_DATA aColTab[] =
+ static ColorData const aColTab[] =
{
COL_BLACK,
COL_BLUE,