summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appmain.cxx2
-rw-r--r--sfx2/source/bastyp/frmhtml.cxx8
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx8
-rw-r--r--sfx2/source/bastyp/sfxhtml.cxx2
-rw-r--r--sfx2/source/control/dispatch.cxx4
-rw-r--r--sfx2/source/doc/objmisc.cxx2
6 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 0083bec101b7..b5ab8e04e423 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -85,7 +85,7 @@ DBG_NAME(SfxAppMainCHAOSReg)
//===================================================================
#ifdef TF_POOLABLE
-static SfxItemInfo __READONLY_DATA aItemInfos[] =
+static SfxItemInfo const aItemInfos[] =
{
{ 0, 0 }
};
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 07a20b858f9e..0eef446afc92 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -51,14 +51,14 @@
#define SFX_HTMLFRMSIZE_REL 0x0001
#define SFX_HTMLFRMSIZE_PERCENT 0x0002
-static sal_Char __READONLY_DATA sHTML_SC_yes[] = "YES";
-static sal_Char __READONLY_DATA sHTML_SC_no[] = "NO";
-static sal_Char __READONLY_DATA sHTML_SC_auto[] = "AUTO";
+static sal_Char const sHTML_SC_yes[] = "YES";
+static sal_Char const sHTML_SC_no[] = "NO";
+static sal_Char const sHTML_SC_auto[] = "AUTO";
#define HTML_O_READONLY "READONLY"
#define HTML_O_EDIT "EDIT"
-static HTMLOptionEnum __READONLY_DATA aScollingTable[] =
+static HTMLOptionEnum const aScollingTable[] =
{
{ sHTML_SC_yes, ScrollingYes },
{ sHTML_SC_no, ScrollingNo },
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index e8d8c2d39c2d..99b63216712a 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -61,10 +61,10 @@
using namespace ::com::sun::star;
-static sal_Char __READONLY_DATA sHTML_SC_yes[] = "YES";
-static sal_Char __READONLY_DATA sHTML_SC_no[] = "NO";
-static sal_Char __READONLY_DATA sHTML_SC_auto[] = "AUTO";
-static sal_Char __READONLY_DATA sHTML_MIME_text_html[] = "text/html; charset=";
+static sal_Char const sHTML_SC_yes[] = "YES";
+static sal_Char const sHTML_SC_no[] = "NO";
+static sal_Char const sHTML_SC_auto[] = "AUTO";
+static sal_Char const sHTML_MIME_text_html[] = "text/html; charset=";
/* not used anymore?
static HTMLOutEvent aFrameSetEventTable[] =
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 839bd996571e..2cbf127a6a75 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -63,7 +63,7 @@ sal_Char sHTML_MIME_application[] = "application/";
sal_Char sHTML_MIME_experimental[] = "x-";
// <INPUT TYPE=xxx>
-static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] =
+static HTMLOptionEnum const aAreaShapeOptEnums[] =
{
{ OOO_STRING_SVTOOLS_HTML_SH_rect, IMAP_OBJ_RECTANGLE },
{ OOO_STRING_SVTOOLS_HTML_SH_rectangle, IMAP_OBJ_RECTANGLE },
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index c249cdfc84e5..66550f2ece22 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2125,12 +2125,12 @@ void SfxDispatcher::SetSlotFilter
gezieltes disablen der Slots 1, 2 und 3:
- static sal_uInt16 __READONLY_DATA pSIDs[] = { 1, 2, 3 };
+ static sal_uInt16 const pSIDs[] = { 1, 2, 3 };
pDisp->SetSlotFilter( sal_False, sizeof(pSIDs)/sizeof(sal_uInt16), pSIDs );
nur die Slots 5, 6 und 7 zulassen:
- static sal_uInt16 __READONLY_DATA pSIDs[] = { 5, 6, 7 };
+ static sal_uInt16 const pSIDs[] = { 5, 6, 7 };
pDisp->SetSlotFilter( sal_True, sizeof(pSIDs)/sizeof(sal_uInt16), pSIDs );
Filter ausschalten:
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6bf22441d146..4adfbbfd2ead 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -170,7 +170,7 @@ public:
//=========================================================================
-sal_uInt16 __READONLY_DATA aTitleMap_Impl[3][2] =
+sal_uInt16 const aTitleMap_Impl[3][2] =
{
// local remote
/* SFX_TITLE_CAPTION */ { SFX_TITLE_FILENAME, SFX_TITLE_TITLE },