summaryrefslogtreecommitdiff
path: root/sw/source/filter/rtf
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/rtf
parent29f5b4f7f009491b6d9780f831455397e77aa626 (diff)
change of __READONLY_DATA define to const
Diffstat (limited to 'sw/source/filter/rtf')
-rw-r--r--sw/source/filter/rtf/rtffld.cxx34
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
2 files changed, 18 insertions, 18 deletions
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