[Libreoffice-commits] .: automation/source cui/source extensions/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Dec 12 00:18:19 PST 2010
automation/source/testtool/cmdstrm.cxx | 2 +-
automation/source/testtool/cmdstrm.hxx | 2 +-
automation/source/testtool/objtest.cxx | 6 +++---
automation/source/testtool/objtest.hxx | 2 +-
cui/source/dialogs/hldoctp.cxx | 8 ++++----
cui/source/dialogs/hlinettp.cxx | 10 +++++-----
cui/source/options/optpath.cxx | 2 +-
cui/source/options/treeopt.cxx | 2 +-
cui/source/tabpages/numpages.cxx | 2 +-
extensions/source/propctrlr/fontdialog.cxx | 2 +-
10 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit a7e1112f7bc21ac58dd260dde7bd6a819903679e
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Dec 12 09:17:59 2010 +0100
change of __READONLY_DATA define to const
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index 71d9499..8e31a3b 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -39,7 +39,7 @@
#include "svcommstream.hxx"
#include <basic/testtool.hrc>
-ControlDefLoad __READONLY_DATA CmdStream::arKeyCodes [] =
+ControlDefLoad const CmdStream::arKeyCodes [] =
#include <keycodes.hxx>
CNames *CmdStream::pKeyCodes = NULL;
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index a9eb8b8..592f64c 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -60,7 +60,7 @@ public:
SvMemoryStream* GetStream();
static CNames *pKeyCodes; // Namen der Sondertasten MOD1, F1, LEFT ...
- static ControlDefLoad __READONLY_DATA arKeyCodes [];
+ static ControlDefLoad const arKeyCodes [];
private:
String WandleKeyEventString( String aKeys ); // Nutzt pKeyCodes. <RETURN> <SHIFT LEFT LEFT>
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index dce50bd..a8f31a8 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -105,11 +105,11 @@ static CommunicationFactory aComManFac;
#define KEEP_SEQUENCES 100 // Keep Names of last 100 Calls
-ControlDefLoad __READONLY_DATA Controls::arClasses [] =
+ControlDefLoad const Controls::arClasses [] =
#include "classes.hxx"
CNames *Controls::pClasses = NULL;
-ControlDefLoad __READONLY_DATA TestToolObj::arR_Cmds [] =
+ControlDefLoad const TestToolObj::arR_Cmds [] =
#include "r_cmds.hxx"
CNames *TestToolObj::pRCommands = NULL;
CErrors *TestToolObj::pFehlerListe = NULL; // Hier werden die Fehler des Testtools gespeichert
@@ -3862,7 +3862,7 @@ String TestToolObj::GetKeyName( USHORT nKeyCode )
void TestToolObj::ReplaceNumbers(String &aText)
{
-static ControlDefLoad __READONLY_DATA arRes_Type [] =
+static ControlDefLoad const arRes_Type [] =
#include "res_type.hxx"
static CNames *pRTypes = NULL;
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index b2478d3..30b27a3 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -236,7 +236,7 @@ public:
virtual SbxVariable* Find( const String&, SbxClassType );
SbxTransportMethodRef pMethodVar; // zum Transport von Find nach Notify
static CNames *pClasses;
- static ControlDefLoad __READONLY_DATA arClasses [];
+ static ControlDefLoad const arClasses [];
};
SV_DECL_IMPL_REF(Controls);
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 3a8bb10..1389725 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -38,11 +38,11 @@
#include "hyperdlg.hrc"
#include "hlmarkwn_def.hxx"
-sal_Char __READONLY_DATA sHash[] = "#";
-sal_Char __READONLY_DATA sFileScheme[] = INET_FILE_SCHEME;
-sal_Char __READONLY_DATA sNewsSRVScheme[] = "news://";
+sal_Char const sHash[] = "#";
+sal_Char const sFileScheme[] = INET_FILE_SCHEME;
+sal_Char const sNewsSRVScheme[] = "news://";
// TODO news:// is nonsense
-sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME;
+sal_Char const sHTTPScheme[] = INET_HTTP_SCHEME;
/*************************************************************************
|*
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 613d4b0..bb89b78 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -40,11 +40,11 @@
#define STD_DOC_SUBPATH "internal"
#define STD_DOC_NAME "url_transfer.htm"
-sal_Char __READONLY_DATA sAnonymous[] = "anonymous";
-sal_Char __READONLY_DATA sHTTPScheme[] = INET_HTTP_SCHEME;
-sal_Char __READONLY_DATA sHTTPSScheme[] = INET_HTTPS_SCHEME;
-sal_Char __READONLY_DATA sFTPScheme[] = INET_FTP_SCHEME;
-sal_Char __READONLY_DATA sTelnetScheme[] = INET_TELNET_SCHEME;
+sal_Char const sAnonymous[] = "anonymous";
+sal_Char const sHTTPScheme[] = INET_HTTP_SCHEME;
+sal_Char const sHTTPSScheme[] = INET_HTTPS_SCHEME;
+sal_Char const sFTPScheme[] = INET_FTP_SCHEME;
+sal_Char const sTelnetScheme[] = INET_TELNET_SCHEME;
/*************************************************************************
|*
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index df491a3..a7506cc 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -123,7 +123,7 @@ struct Handle2CfgNameMapping_Impl
const char* m_pCfgName;
};
-static Handle2CfgNameMapping_Impl __READONLY_DATA Hdl2CfgMap_Impl[] =
+static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] =
{
{ SvtPathOptions::PATH_AUTOCORRECT, "AutoCorrect" },
{ SvtPathOptions::PATH_AUTOTEXT, "AutoText" },
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index ed17414..6628b76 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -382,7 +382,7 @@ struct OptionsMapping_Impl
USHORT m_nPageId;
};
-static OptionsMapping_Impl __READONLY_DATA OptionsMap_Impl[] =
+static OptionsMapping_Impl const OptionsMap_Impl[] =
{
// GROUP PAGE PAGE-ID
{ "ProductName", NULL, SID_GENERAL_OPTIONS },
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index fcd1b06..484cc63 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -162,7 +162,7 @@ static const sal_Unicode aBulletTypes[] =
0x2714
};
-static sal_Char __READONLY_DATA aNumChar[] =
+static sal_Char const aNumChar[] =
{
'A', //CHARS_UPPER_LETTER
'a', //CHARS_LOWER_LETTER
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index c18d573..2869d17 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -527,7 +527,7 @@ namespace pcr
*pCounter++ = new SvxFontListItem (new FontList(Application::GetDefaultDevice()), CFID_FONTLIST);
// create the pool
- static SfxItemInfo __READONLY_DATA aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] =
+ static SfxItemInfo const aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] =
{
{ SID_ATTR_CHAR_FONT, 0 },
{ SID_ATTR_CHAR_FONTHEIGHT, 0 },
More information about the Libreoffice-commits
mailing list