Here are patches to the various git repositories to remove the empty
__FAR_DATA macro from solar.h. Changes are under LGPLv3+ / MPL as
requested (Although I'm not sure you technically need a license for
code removal?)
Michael
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a373e8f..1fc2c05 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -607,7 +607,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
{
if ( !m_pDocElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
@@ -629,7 +629,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
{
if ( !m_pDatabaseElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE },
{ XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS},
@@ -649,7 +649,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
{
if ( !m_pDataSourceElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE,
XML_TOK_CONNECTION_RESOURCE},
{ XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS,
XML_TOK_SUPPRESS_VERSION_COLUMNS},
@@ -700,7 +700,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
{
if ( !m_pLoginElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME},
{ XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED,
XML_TOK_IS_PASSWORD_REQUIRED},
@@ -717,7 +717,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
{
if ( !m_pDatabaseDescriptionElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE,
XML_TOK_FILE_BASED_DATABASE},
{ XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE},
@@ -732,7 +732,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
{
if ( !m_pDataSourceInfoElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB,
XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT},
{ XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,
XML_TOK_ROW_RETRIEVING_STATEMENT},
@@ -758,7 +758,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
{
if ( !m_pDocumentsElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT},
{ XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION,
XML_TOK_COMPONENT_COLLECTION},
@@ -778,7 +778,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
{
if ( !m_pComponentElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE },
@@ -797,7 +797,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
{
if ( !m_pQueryElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND },
{ XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING },
@@ -821,7 +821,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
{
if ( !m_pColumnElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_NAME,
XML_TOK_COLUMN_NAME },
{ XML_NAMESPACE_DB, XML_STYLE_NAME,
XML_TOK_COLUMN_STYLE_NAME },
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 43952c9..702d570 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -93,9 +93,9 @@ namespace dbaui
bool m_bNeedToReInitialize;
#if defined UNX
- static const char __FAR_DATA sNewLine;
+ static const char sNewLine;
#else
- static const char __FAR_DATA sNewLine[];
+ static const char sNewLine[];
#endif
ODatabaseExport* m_pReader;
@@ -178,7 +178,7 @@ namespace dbaui
// HtmlFontSz[1-7] in s*3.ini [user]
static sal_Int16 nFontSize[SBA_HTML_FONTSIZES];
static const sal_Int16 nCellSpacing;
- static const char __FAR_DATA sIndentSource[];
+ static const char sIndentSource[];
char sIndent[nIndentMax+1];
sal_Int16 m_nIndent;
#ifdef DBG_UTIL
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index a92f474..79c112b 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -82,15 +82,15 @@ using namespace ::com::sun::star::util;
using ::com::sun::star::frame::XModel;
#if defined(UNX)
-const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012';
+const char ODatabaseImportExport::sNewLine = '\012';
#else
-const char __FAR_DATA ODatabaseImportExport::sNewLine[] = "\015\012";
+const char ODatabaseImportExport::sNewLine[] = "\015\012";
#endif
-const static char __FAR_DATA sMyBegComment[] = "<!-- ";
-const static char __FAR_DATA sMyEndComment[] = " -->";
-const static char __FAR_DATA sFontFamily[] = "font-family: ";
-const static char __FAR_DATA sFontSize[] = "font-size: ";
+const static char sMyBegComment[] = "<!-- ";
+const static char sMyEndComment[] = " -->";
+const static char sFontFamily[] = "font-family: ";
+const static char sFontSize[] = "font-size: ";
#define SBA_FORMAT_SELECTION_COUNT 4
#define CELL_X 1437
@@ -660,7 +660,7 @@ BOOL ORTFImportExport::Read()
}
//-------------------------------------------------------------------
//===================================================================
-const sal_Int16 __FAR_DATA OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] =
+const sal_Int16 OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] =
{
HTMLFONTSZ1_DFLT, HTMLFONTSZ2_DFLT, HTMLFONTSZ3_DFLT, HTMLFONTSZ4_DFLT,
HTMLFONTSZ5_DFLT, HTMLFONTSZ6_DFLT, HTMLFONTSZ7_DFLT
@@ -669,7 +669,7 @@ const sal_Int16 __FAR_DATA OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZE
sal_Int16 OHTMLImportExport::nFontSize[SBA_HTML_FONTSIZES] = { 0 };
const sal_Int16 OHTMLImportExport::nCellSpacing = 0;
-const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] =
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+const char OHTMLImportExport::sIndentSource[nIndentMax+1] =
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
//========================================================================
// Macros for HTML-Export
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx
b/reportdesign/source/filter/xml/xmlHelper.cxx
index 89f9b6b..edcc09e 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -350,7 +350,7 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
// -----------------------------------------------------------------------------
SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_REPORT_HEADER,
XML_TOK_REPORT_HEADER },
{ XML_NAMESPACE_REPORT, XML_PAGE_HEADER ,
XML_TOK_PAGE_HEADER },
@@ -377,7 +377,7 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
// -----------------------------------------------------------------------------
SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD,
XML_TOK_MASTER_DETAIL_FIELD},
{ XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER},
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 7038b9c..67e43e7 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -741,7 +741,7 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
{
if ( !m_pDocElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES
},
@@ -776,7 +776,7 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
{
if ( !m_pFunctionElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME },
{ XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA},
@@ -794,7 +794,7 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
{
if ( !m_pFormatElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED },
{ XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA },
@@ -810,7 +810,7 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
{
if ( !m_pGroupElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN ,
XML_TOK_START_NEW_COLUMN },
{ XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER ,
XML_TOK_RESET_PAGE_NUMBER },
@@ -835,7 +835,7 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
{
if ( !m_pElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES
,XML_TOK_PRINT_REPEATED_VALUES },
{ XML_NAMESPACE_REPORT,
XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE },
@@ -853,7 +853,7 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
{
if ( !m_pControlElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL
},
{ XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES
},
@@ -875,7 +875,7 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
{
if ( !m_pControlElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME
},
{ XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE
},
@@ -897,7 +897,7 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
{
if ( !m_pComponentElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DRAW, XML_NAME ,
XML_TOK_NAME },
{ XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME ,
XML_TOK_TEXT_STYLE_NAME },
@@ -913,7 +913,7 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
{
if ( !m_pColumnTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_NAME ,
XML_TOK_NAME },
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME ,
XML_TOK_COLUMN_STYLE_NAME },
@@ -937,7 +937,7 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
{
if ( !m_pSectionElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_TABLE ,
XML_TOK_TABLE },
{ XML_NAMESPACE_TABLE, XML_NAME ,
XML_TOK_SECTION_NAME },
@@ -960,7 +960,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
{
if ( !m_pCellElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_TEXT, XML_P ,
XML_TOK_P },
{ XML_NAMESPACE_REPORT, XML_FIXED_CONTENT ,
XML_TOK_FIXED_CONTENT },
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index b9af426..2d8c307 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -57,7 +57,7 @@ class ScEditUtil
Fraction aZoomX;
Fraction aZoomY;
- static const char __FAR_DATA pCalcDelimiters[];
+ static const char pCalcDelimiters[];
public:
static String ModifyDelimiters( const String& rOld );
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index 007d093..3544eae 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -47,7 +47,7 @@ private:
xub_StrLen nSelEnd;
public:
- static const sal_Unicode __FAR_DATA pDelimiters[];
+ static const sal_Unicode pDelimiters[];
ScRefFinder( const String& rFormula,
ScDocument* pDocument = NULL,
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index dc3072b..2bb2a09 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -57,9 +57,9 @@
const sal_Char *linker_dummy = "";
// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen)
-//static const sal_Char __FAR_DATA cStandardName[] = "Standard";
+//static const sal_Char cStandardName[] = "Standard";
-static const sal_Char __FAR_DATA sAutoTblFmtName[] = "autotbl.fmt";
+static const sal_Char sAutoTblFmtName[] = "autotbl.fmt";
// bis SO5PF
const USHORT AUTOFORMAT_ID_X = 9501;
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index cd31717..e4cfa04 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -69,7 +69,7 @@
// Delimiters zusaetzlich zu EditEngine-Default:
-const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>";
+const sal_Char ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>";
//------------------------------------------------------------------------
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index eabcc29..7c37084 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2229,7 +2229,7 @@ void ScInterpreter::ScBase()
BYTE nParamCount = GetByte();
if ( MustHaveParamCount( nParamCount, 2, 3 ) )
{
- static const sal_Unicode __FAR_DATA pDigits[] = {
+ static const sal_Unicode pDigits[] = {
'0','1','2','3','4','5','6','7','8','9',
'A','B','C','D','E','F','G','H','I','J','K','L','M',
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 461ce92..42420cd 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -43,7 +43,7 @@
// STATIC DATA -----------------------------------------------------------
// incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt
-const sal_Unicode __FAR_DATA ScRefFinder::pDelimiters[] = {
+const sal_Unicode ScRefFinder::pDelimiters[] = {
'=','(',')','+','-','*','/','^','&',' ','{','}','<','>',':', 0
};
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 3205faa..e4681f5 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -37,7 +37,7 @@
#include "zforauto.hxx"
#include "global.hxx"
-static const sal_Char __FAR_DATA pStandardName[] = "Standard";
+static const sal_Char pStandardName[] = "Standard";
//------------------------------------------------------------------------
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index bf12e7b..e469040 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -105,12 +105,12 @@
//========================================================================
-const static sal_Char __FAR_DATA sMyBegComment[] = "<!-- ";
-const static sal_Char __FAR_DATA sMyEndComment[] = " -->";
-const static sal_Char __FAR_DATA sFontFamily[] = "font-family:";
-const static sal_Char __FAR_DATA sFontSize[] = "font-size:";
+const static sal_Char sMyBegComment[] = "<!-- ";
+const static sal_Char sMyEndComment[] = " -->";
+const static sal_Char sFontFamily[] = "font-family:";
+const static sal_Char sFontSize[] = "font-size:";
-const USHORT __FAR_DATA ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
+const USHORT ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
{
HTMLFONTSZ1_DFLT, HTMLFONTSZ2_DFLT, HTMLFONTSZ3_DFLT, HTMLFONTSZ4_DFLT,
HTMLFONTSZ5_DFLT, HTMLFONTSZ6_DFLT, HTMLFONTSZ7_DFLT
@@ -118,13 +118,13 @@ const USHORT __FAR_DATA ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
USHORT ScHTMLExport::nFontSize[SC_HTML_FONTSIZES] = { 0 };
-const char* __FAR_DATA ScHTMLExport::pFontSizeCss[SC_HTML_FONTSIZES] =
+const char* ScHTMLExport::pFontSizeCss[SC_HTML_FONTSIZES] =
{
"xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"
};
const USHORT ScHTMLExport::nCellSpacing = 0;
-const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] =
+const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] =
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
//========================================================================
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index e734a81..c6e1056 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -41,9 +41,9 @@ class ScExportBase
{
public:
#if defined UNX
- static const sal_Char __FAR_DATA sNewLine;
+ static const sal_Char sNewLine;
#else
- static const sal_Char __FAR_DATA sNewLine[];
+ static const sal_Char sNewLine[];
#endif
protected:
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 3cc00e3..6e605a4 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -100,7 +100,7 @@ class ScHTMLExport : public ScExportBase
static USHORT nFontSize[SC_HTML_FONTSIZES];
static const char* pFontSizeCss[SC_HTML_FONTSIZES];
static const USHORT nCellSpacing;
- static const sal_Char __FAR_DATA sIndentSource[];
+ static const sal_Char sIndentSource[];
ScHTMLGraphList aGraphList;
ScHTMLStyle aHTMLStyle;
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index e59959c..fd7e0f9 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -40,9 +40,9 @@
//------------------------------------------------------------------
#if defined(UNX)
-const sal_Char __FAR_DATA ScExportBase::sNewLine = '\012';
+const sal_Char ScExportBase::sNewLine = '\012';
#else
-const sal_Char __FAR_DATA ScExportBase::sNewLine[] = "\015\012";
+const sal_Char ScExportBase::sNewLine[] = "\015\012";
#endif
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index c59581c..cfea289 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -209,7 +209,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME },
{ XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME,
XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME },
@@ -428,7 +428,7 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap()
{
if( !pDocElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
+ static SvXMLTokenMapEntry aDocTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS
},
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES
},
@@ -453,7 +453,7 @@ const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap()
{
if( !pBodyElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] =
+ static SvXMLTokenMapEntry aBodyTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES,
XML_TOK_BODY_TRACKED_CHANGES },
{ XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS
},
@@ -479,7 +479,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationsElemTokenMap()
{
if( !pContentValidationsElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationsElemTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION },
XML_TOKEN_MAP_END
@@ -495,7 +495,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationElemTokenMap()
{
if( !pContentValidationElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationElemTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_HELP_MESSAGE,
XML_TOK_CONTENT_VALIDATION_ELEM_HELP_MESSAGE },
{ XML_NAMESPACE_TABLE, XML_ERROR_MESSAGE,
XML_TOK_CONTENT_VALIDATION_ELEM_ERROR_MESSAGE },
@@ -514,7 +514,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationAttrTokenMap()
{
if( !pContentValidationAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_CONTENT_VALIDATION_NAME },
{ XML_NAMESPACE_TABLE, XML_CONDITION,
XML_TOK_CONTENT_VALIDATION_CONDITION },
@@ -534,7 +534,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap()
{
if( !pContentValidationMessageElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_P, XML_TOK_P },
XML_TOKEN_MAP_END
@@ -550,7 +550,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationHelpMessageAttrTokenMap()
{
if( !pContentValidationHelpMessageAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE },
{ XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY },
@@ -567,7 +567,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMessageAttrTokenMap()
{
if( !pContentValidationErrorMessageAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE
},
{ XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY
},
@@ -585,7 +585,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMacroAttrTokenMap()
{
if( !pContentValidationErrorMacroAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] =
+ static SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE },
@@ -602,7 +602,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangesElemTokenMap()
{
if( !pLabelRangesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aLabelRangesElemTokenMap[] =
+ static SvXMLTokenMapEntry aLabelRangesElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM },
XML_TOKEN_MAP_END
@@ -618,7 +618,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangeAttrTokenMap()
{
if( !pLabelRangeAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS,
XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE },
{ XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS,
XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE },
@@ -636,7 +636,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
{
if( !pTableElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableTokenMap[] =
+ static SvXMLTokenMapEntry aTableTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP,
XML_TOK_TABLE_COL_GROUP },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS,
XML_TOK_TABLE_HEADER_COLS },
@@ -666,7 +666,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
{
if (!pTableProtectionElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aTableProtectionTokenMap[] =
+ static SvXMLTokenMapEntry aTableProtectionTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS,
XML_TOK_TABLE_SELECT_PROTECTED_CELLS },
{ XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS,
XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS },
@@ -682,7 +682,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
{
if( !pTableRowsElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableRowsElemTokenMap[] =
+ static SvXMLTokenMapEntry aTableRowsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS },
@@ -701,7 +701,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableColsElemTokenMap()
{
if( !pTableColsElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableColsElemTokenMap[] =
+ static SvXMLTokenMapEntry aTableColsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP,
XML_TOK_TABLE_COLS_COL_GROUP },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS },
@@ -720,7 +720,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap()
{
if( !pTableAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_NAME },
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME },
@@ -743,7 +743,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableScenarioAttrTokenMap()
{
if( !pTableScenarioAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER,
XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER },
{ XML_NAMESPACE_TABLE, XML_BORDER_COLOR,
XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR },
@@ -767,7 +767,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableColAttrTokenMap()
{
if( !pTableColAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableColAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableColAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_COL_ATTR_STYLE_NAME },
{ XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
XML_TOK_TABLE_COL_ATTR_REPEATED },
@@ -786,7 +786,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowElemTokenMap()
{
if( !pTableRowElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableRowTokenMap[] =
+ static SvXMLTokenMapEntry aTableRowTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL
},
{ XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL
},
@@ -803,7 +803,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowAttrTokenMap()
{
if( !pTableRowAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableRowAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableRowAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_ROW_ATTR_STYLE_NAME },
{ XML_NAMESPACE_TABLE, XML_VISIBILITY,
XML_TOK_TABLE_ROW_ATTR_VISIBILITY },
@@ -823,7 +823,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
{
if( !pTableRowCellElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] =
+ static SvXMLTokenMapEntry aTableRowCellTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_P,
XML_TOK_TABLE_ROW_CELL_P },
{ XML_NAMESPACE_TABLE, XML_SUB_TABLE,
XML_TOK_TABLE_ROW_CELL_TABLE },
@@ -843,7 +843,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap()
{
if( !pTableAnnotationAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_AUTHOR,
XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR },
{ XML_NAMESPACE_OFFICE, XML_CREATE_DATE,
XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE },
@@ -864,7 +864,7 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap()
{
if( !pDetectiveElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDetectiveElemTokenMap[]=
+ static SvXMLTokenMapEntry aDetectiveElemTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED
},
{ XML_NAMESPACE_TABLE, XML_OPERATION,
XML_TOK_DETECTIVE_ELEM_OPERATION },
@@ -881,7 +881,7 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap()
{
if( !pDetectiveHighlightedAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
+ static SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE },
{ XML_NAMESPACE_TABLE, XML_DIRECTION,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION },
@@ -900,7 +900,7 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap()
{
if( !pDetectiveOperationAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]=
+ static SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX },
@@ -917,7 +917,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap()
{
if( !pTableCellRangeSourceAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF },
@@ -939,7 +939,7 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionsElemTokenMap()
{
if( !pNamedExpressionsElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionsTokenMap[] =
+ static SvXMLTokenMapEntry aNamedExpressionsTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAMED_RANGE,
XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE },
{ XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION,
XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION },
@@ -956,7 +956,7 @@ const SvXMLTokenMap& ScXMLImport::GetNamedRangeAttrTokenMap()
{
if( !pNamedRangeAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_NAMED_RANGE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS },
@@ -975,7 +975,7 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionAttrTokenMap()
{
if( !pNamedExpressionAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
+ static SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_NAMED_EXPRESSION_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,
XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS },
@@ -993,7 +993,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangesElemTokenMap()
{
if( !pDatabaseRangesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangesTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangesTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE },
XML_TOKEN_MAP_END
@@ -1009,7 +1009,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeElemTokenMap()
{
if( !pDatabaseRangeElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL
},
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE
},
@@ -1030,7 +1030,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeAttrTokenMap()
{
if( !pDatabaseRangeAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATABASE_RANGE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_IS_SELECTION,
XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION },
@@ -1055,7 +1055,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap()
{
if( !pDatabaseRangeSourceSQLAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF
},
@@ -1075,7 +1075,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap()
{
if( !pDatabaseRangeSourceTableAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF
},
@@ -1094,7 +1094,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap()
{
if( !pDatabaseRangeSourceQueryAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF
},
@@ -1113,7 +1113,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap()
{
if( !pFilterElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aFilterTokenMap[] =
+ static SvXMLTokenMapEntry aFilterTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND
},
{ XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR
},
@@ -1131,7 +1131,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap()
{
if( !pFilterAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aFilterAttrTokenMap[] =
+ static SvXMLTokenMapEntry aFilterAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,
XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS },
{ XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS,
XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS },
@@ -1150,7 +1150,7 @@ const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap()
{
if( !pFilterConditionAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
+ static SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER },
{ XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE },
@@ -1170,7 +1170,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap()
{
if( !pSortElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSortTokenMap[] =
+ static SvXMLTokenMapEntry aSortTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY },
XML_TOKEN_MAP_END
@@ -1186,7 +1186,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortAttrTokenMap()
{
if( !pSortAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSortAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSortAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT,
XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT },
{ XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,
XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS },
@@ -1207,7 +1207,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap()
{
if( !pSortSortByAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER },
{ XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE
},
@@ -1225,7 +1225,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap()
{
if( !pDatabaseRangeSubTotalRulesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS
},
{ XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE },
@@ -1242,7 +1242,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap()
{
if( !pDatabaseRangeSubTotalRulesAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT,
XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT },
{ XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE,
XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE },
@@ -1260,7 +1260,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap()
{
if( !pSubTotalRulesSortGroupsAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE },
{ XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER },
@@ -1277,7 +1277,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap()
{
if( !pSubTotalRulesSubTotalRuleElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] =
+ static SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD },
XML_TOKEN_MAP_END
@@ -1293,7 +1293,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleAttrTokenMap()
{
if( !pSubTotalRulesSubTotalRuleAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER,
XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER },
XML_TOKEN_MAP_END
@@ -1309,7 +1309,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRuleSubTotalFieldAttrTokenMap()
{
if( !pSubTotalRuleSubTotalFieldAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER
},
{ XML_NAMESPACE_TABLE, XML_FUNCTION,
XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION },
@@ -1326,7 +1326,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap()
{
if( !pDataPilotTablesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE },
XML_TOKEN_MAP_END
@@ -1342,7 +1342,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap()
{
if( !pDataPilotTableAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATA_PILOT_TABLE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_APPLICATION_DATA,
XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA },
@@ -1367,7 +1367,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
{
if( !pDataPilotTableElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL },
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE,
XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE },
@@ -1389,7 +1389,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
{
if( !pDataPilotTableSourceServiceAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_SOURCE_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME },
@@ -1409,7 +1409,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotGrandTotalAttrTokenMap()
{
if (!pDataPilotGrandTotalAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotGrandTotalAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DISPLAY,
XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_DISPLAY },
{ XML_NAMESPACE_TABLE, XML_ORIENTATION,
XML_TOK_DATA_PILOT_GRAND_TOTAL_ATTR_ORIENTATION },
@@ -1428,7 +1428,7 @@ const SvXMLTokenMap&
ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap()
{
if( !pDataPilotTableSourceCellRangeAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS},
XML_TOKEN_MAP_END
@@ -1444,7 +1444,7 @@ const SvXMLTokenMap&
ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap()
{
if( !pDataPilotTableSourceCellRangeElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER},
XML_TOKEN_MAP_END
@@ -1460,7 +1460,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldAttrTokenMap()
{
if( !pDataPilotFieldAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME,
XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME },
{ XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_FIELD_ATTR_DISPLAY_NAME },
@@ -1483,7 +1483,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap()
{
if( !pDataPilotFieldElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL },
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE },
@@ -1501,7 +1501,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap()
{
if( !pDataPilotLevelAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SHOW_EMPTY,
XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY },
XML_TOKEN_MAP_END
@@ -1517,7 +1517,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap()
{
if( !pDataPilotLevelElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS,
XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS },
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS,
XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS },
@@ -1537,7 +1537,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap()
{
if( !pDataPilotSubTotalsElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL,
XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL },
XML_TOKEN_MAP_END
@@ -1553,7 +1553,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalAttrTokenMap()
{
if( !pDataPilotSubTotalAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION
},
{ XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME },
@@ -1571,7 +1571,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap()
{
if( !pDataPilotMembersElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER },
XML_TOKEN_MAP_END
@@ -1587,7 +1587,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMemberAttrTokenMap()
{
if( !pDataPilotMemberAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME
},
{ XML_NAMESPACE_TABLE, XML_DISPLAY_NAME,
XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY_NAME },
@@ -1607,7 +1607,7 @@ const SvXMLTokenMap& ScXMLImport::GetConsolidationAttrTokenMap()
{
if( !pConsolidationAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aConsolidationAttrTokenMap[] =
+ static SvXMLTokenMapEntry aConsolidationAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FUNCTION,
XML_TOK_CONSOLIDATION_ATTR_FUNCTION },
{ XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES,
XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES },
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d50a581..d80108c 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -106,7 +106,7 @@ BOOL ScInputHandler::bAutoComplete = FALSE; // wird in KeyInput
gesetzt
// only characters that are allowed in formulas next to references
// and the quotation mark (so string constants can be skipped)
-static const sal_Char __FAR_DATA pMinDelimiters[] = " !\"";
+static const sal_Char pMinDelimiters[] = " !\"";
extern USHORT nEditAdjust; //! Member an ViewData
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 19aa38f..c4a256a 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -44,8 +44,8 @@
// ============================================================================
-static const sal_Char __FAR_DATA pStrFix[] = "FIX";
-static const sal_Char __FAR_DATA pStrMrg[] = "MRG";
+static const sal_Char pStrFix[] = "FIX";
+static const sal_Char pStrMrg[] = "MRG";
// ============================================================================
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index effef61..2c602f5 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -155,36 +155,36 @@ using ::std::vector;
// Stream-Namen im Storage
-const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; //
"StarCalcDocument"
-const sal_Char __FAR_DATA ScDocShell::pStyleName[] = "SfxStyleSheets";
+const sal_Char ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument"
+const sal_Char ScDocShell::pStyleName[] = "SfxStyleSheets";
// Filter-Namen (wie in sclib.cxx)
-static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
-//static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
-//static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
-//static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
-static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
-static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
-static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0";
-static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
-static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
-static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
-static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
-static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
-static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char __FAR_DATA pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
-static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const sal_Char pFilterSc50[] = "StarCalc 5.0";
+//static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
+static const sal_Char pFilterSc40[] = "StarCalc 4.0";
+//static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
+static const sal_Char pFilterSc30[] = "StarCalc 3.0";
+//static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
+static const sal_Char pFilterSc10[] = "StarCalc 1.0";
+static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
+static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)";
+static const sal_Char pFilterLotus[] = "Lotus";
+static const sal_Char pFilterQPro6[] = "Quattro Pro 6.0";
+static const sal_Char pFilterExcel4[] = "MS Excel 4.0";
+static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95";
+static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const sal_Char pFilterExcel95[] = "MS Excel 95";
+static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const sal_Char pFilterExcel97[] = "MS Excel 97";
+static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+static const sal_Char pFilterDBase[] = "dBase";
+static const sal_Char pFilterDif[] = "DIF";
+static const sal_Char pFilterSylk[] = "SYLK";
+static const sal_Char pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
+static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
//----------------------------------------------------------------------
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index bf29914..196f466 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -90,8 +90,8 @@ typedef ::std::hash_map< ULONG, ULONG > ScChangeActionMergeMap;
class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
{
- static const sal_Char __FAR_DATA pStarCalcDoc[];
- static const sal_Char __FAR_DATA pStyleName[];
+ static const sal_Char pStarCalcDoc[];
+ static const sal_Char pStyleName[];
ScDocument aDocument;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index a088cb5..673dae3 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -97,32 +97,32 @@ ScFilterDetect::~ScFilterDetect()
{
}
-static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
-static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
-static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
-static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
-static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
-static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
-static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0";
-static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
-static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
-static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilter2003XML[] = "MS Excel 2003 XML";
-static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
-static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
-static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
-static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery";
-static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const sal_Char pFilterSc50[] = "StarCalc 5.0";
+static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
+static const sal_Char pFilterSc40[] = "StarCalc 4.0";
+static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
+static const sal_Char pFilterSc30[] = "StarCalc 3.0";
+static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
+static const sal_Char pFilterSc10[] = "StarCalc 1.0";
+static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
+static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)";
+static const sal_Char pFilterLotus[] = "Lotus";
+static const sal_Char pFilterQPro6[] = "Quattro Pro 6.0";
+static const sal_Char pFilterExcel4[] = "MS Excel 4.0";
+static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95";
+static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const sal_Char pFilterExcel95[] = "MS Excel 95";
+static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const sal_Char pFilterExcel97[] = "MS Excel 97";
+static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+static const sal_Char pFilter2003XML[] = "MS Excel 2003 XML";
+static const sal_Char pFilterDBase[] = "dBase";
+static const sal_Char pFilterDif[] = "DIF";
+static const sal_Char pFilterSylk[] = "SYLK";
+static const sal_Char pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char pFilterHtmlWeb[] = "calc_HTML_WebQuery";
+static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
static BOOL lcl_MayBeAscii( SvStream& rStream )
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 2b76b57..de3d768 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -247,7 +247,7 @@ struct ProvNamesId_Type
sal_uInt16 nType;
};
-static const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
+static const ProvNamesId_Type aProvNamesId[] =
{
{ "com.sun.star.sheet.Spreadsheet", SC_SERVICE_SHEET },
{ "com.sun.star.text.TextField.URL", SC_SERVICE_URLFIELD },
@@ -315,7 +315,7 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
// in case some macro is still using them
//
-static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] =
+static const sal_Char* aOldNames[SC_SERVICE_COUNT] =
{
"", //
SC_SERVICE_SHEET
"stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 3aaaf47..9ed7cd4 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -113,7 +113,7 @@ static ::rtl::OUString MEDIATYPE_PROPNAME (RTL_CONSTASCII_USTRINGP
static ::rtl::OUString MEDIATYPE_UICONFIG
(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.ui.configuration" ));
//-----------------------------------------------
-static USHORT __FAR_DATA KEYCODE_ARRAY[] =
+static USHORT KEYCODE_ARRAY[] =
{
KEY_F1 ,
KEY_F2 ,
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5be1f05..c8f4fa5 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -113,9 +113,9 @@ static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
static const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
-static const char __FAR_DATA pSeparatorStr[] =
+static const char pSeparatorStr[] =
"----------------------------------";
-static const char __FAR_DATA pMenuSeparatorStr[] = " | ";
+static const char pMenuSeparatorStr[] = " | ";
#ifdef _MSC_VER
#pragma warning (disable:4355)
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 69bc1ac..54f8509 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -118,7 +118,7 @@ _SfxMacroTabPage_Impl::~_SfxMacroTabPage_Impl()
SvStringsDtor* _ImpGetRangeHdl( _SfxMacroTabPage*, const String& rLanguage );
SvStringsDtor* _ImpGetMacrosOfRangeHdl( _SfxMacroTabPage*, const String& rLanguage, const String&
rRange );
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
SID_ATTR_MACROITEM, SID_ATTR_MACROITEM,
0
};
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index e4841ab..7ab2219 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -102,7 +102,7 @@ struct StringIdPair_Impl
// OD 11.11.2003 #i22341#
#define LB_VERT_LINE 0x00400000L // vertical text line
-static RelationMap __FAR_DATA aRelationMap[] =
+static RelationMap aRelationMap[] =
{
{SwFPos::FRAME, SwFPos::FRAME, LB_FRAME, RelOrientation::FRAME},
{SwFPos::PRTAREA, SwFPos::PRTAREA, LB_PRTAREA,
RelOrientation::PRINT_AREA},
@@ -130,7 +130,7 @@ static RelationMap __FAR_DATA aRelationMap[] =
{SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, RelOrientation::TEXT_LINE}
};
-static RelationMap __FAR_DATA aAsCharRelationMap[] =
+static RelationMap aAsCharRelationMap[] =
{
{SwFPos::REL_BASE, SwFPos::REL_BASE, LB_REL_BASE, RelOrientation::FRAME},
{SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB_REL_CHAR, RelOrientation::FRAME},
@@ -144,7 +144,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] =
#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
LB_REL_PG_RIGHT)
-static FrmMap __FAR_DATA aHPageMap[] =
+static FrmMap aHPageMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_PAGE_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_PAGE_REL},
@@ -152,14 +152,14 @@ static FrmMap __FAR_DATA aHPageMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, HORI_PAGE_REL}
};
-static FrmMap __FAR_DATA aHPageHtmlMap[] =
+static FrmMap aHPageHtmlMap[] =
{
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME}
};
#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
-static FrmMap __FAR_DATA aVPageMap[] =
+static FrmMap aVPageMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_PAGE_REL},
{SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_PAGE_REL},
@@ -167,7 +167,7 @@ static FrmMap __FAR_DATA aVPageMap[] =
{SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_PAGE_REL}
};
-static FrmMap __FAR_DATA aVPageHtmlMap[] =
+static FrmMap aVPageHtmlMap[] =
{
{SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, LB_REL_PG_FRAME}
};
@@ -179,7 +179,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] =
#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT)
-static FrmMap __FAR_DATA aHFrameMap[] =
+static FrmMap aHFrameMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_FRAME_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_FRAME_REL},
@@ -187,7 +187,7 @@ static FrmMap __FAR_DATA aHFrameMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, HORI_FRAME_REL}
};
-static FrmMap __FAR_DATA aHFlyHtmlMap[] =
+static FrmMap aHFlyHtmlMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT,
LB_FLY_REL_PG_FRAME},
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE,
LB_FLY_REL_PG_FRAME}
@@ -197,7 +197,7 @@ static FrmMap __FAR_DATA aHFlyHtmlMap[] =
// OD 10.11.2003 #i22305#
#define VERT_FRAME_REL (LB_VERT_FRAME|LB_FLY_VERT_PRTAREA)
-static FrmMap __FAR_DATA aVFrameMap[] =
+static FrmMap aVFrameMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_FRAME_REL},
{SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_FRAME_REL},
@@ -205,17 +205,17 @@ static FrmMap __FAR_DATA aVFrameMap[] =
{SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_FRAME_REL}
};
-static FrmMap __FAR_DATA aVFlyHtmlMap[] =
+static FrmMap aVFlyHtmlMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_FLY_VERT_FRAME},
{SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, LB_FLY_VERT_FRAME}
};
-static FrmMap __FAR_DATA aVMultiSelectionMap[] =
+static FrmMap aVMultiSelectionMap[] =
{
{SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, 0}
};
-static FrmMap __FAR_DATA aHMultiSelectionMap[] =
+static FrmMap aHMultiSelectionMap[] =
{
{SwFPos::FROMLEFT, SwFPos::FROMLEFT, HoriOrientation::NONE, 0}
};
@@ -228,7 +228,7 @@ static FrmMap __FAR_DATA aHMultiSelectionMap[] =
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT)
-static FrmMap __FAR_DATA aHParaMap[] =
+static FrmMap aHParaMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_PARA_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_PARA_REL},
@@ -238,13 +238,13 @@ static FrmMap __FAR_DATA aHParaMap[] =
#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA)
-static FrmMap __FAR_DATA aHParaHtmlMap[] =
+static FrmMap aHParaHtmlMap[] =
{
{SwFPos::LEFT, SwFPos::LEFT, HoriOrientation::LEFT, HTML_HORI_PARA_REL},
{SwFPos::RIGHT, SwFPos::RIGHT, HoriOrientation::RIGHT, HTML_HORI_PARA_REL}
};
-static FrmMap __FAR_DATA aHParaHtmlAbsMap[] =
+static FrmMap aHParaHtmlAbsMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT,
HTML_HORI_PARA_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HTML_HORI_PARA_REL}
@@ -254,7 +254,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] =
#define VERT_PARA_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
-static FrmMap __FAR_DATA aVParaMap[] =
+static FrmMap aVParaMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, VERT_PARA_REL},
{SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, VERT_PARA_REL},
@@ -262,7 +262,7 @@ static FrmMap __FAR_DATA aVParaMap[] =
{SwFPos::FROMTOP, SwFPos::FROMTOP, VertOrientation::NONE, VERT_PARA_REL}
};
-static FrmMap __FAR_DATA aVParaHtmlMap[] =
+static FrmMap aVParaHtmlMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_VERT_PRTAREA}
};
@@ -275,7 +275,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] =
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT|LB_REL_CHAR)
-static FrmMap __FAR_DATA aHCharMap[] =
+static FrmMap aHCharMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT, HORI_CHAR_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, HORI_CHAR_REL},
@@ -285,13 +285,13 @@ static FrmMap __FAR_DATA aHCharMap[] =
#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR)
-static FrmMap __FAR_DATA aHCharHtmlMap[] =
+static FrmMap aHCharHtmlMap[] =
{
{SwFPos::LEFT, SwFPos::LEFT, HoriOrientation::LEFT,
HTML_HORI_CHAR_REL},
{SwFPos::RIGHT, SwFPos::RIGHT, HoriOrientation::RIGHT, HTML_HORI_CHAR_REL}
};
-static FrmMap __FAR_DATA aHCharHtmlAbsMap[] =
+static FrmMap aHCharHtmlAbsMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, HoriOrientation::LEFT,
LB_PRTAREA|LB_REL_CHAR},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, HoriOrientation::RIGHT, LB_PRTAREA},
@@ -303,7 +303,7 @@ static FrmMap __FAR_DATA aHCharHtmlAbsMap[] =
#define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
-static FrmMap __FAR_DATA aVCharMap[] =
+static FrmMap aVCharMap[] =
{
// OD 11.11.2003 #i22341#
// introduce mappings for new vertical alignment at top of line <LB_VERT_LINE>
@@ -324,12 +324,12 @@ static FrmMap __FAR_DATA aVCharMap[] =
};
-static FrmMap __FAR_DATA aVCharHtmlMap[] =
+static FrmMap aVCharHtmlMap[] =
{
{SwFPos::BELOW, SwFPos::BELOW, VertOrientation::CHAR_BOTTOM, LB_REL_CHAR}
};
-static FrmMap __FAR_DATA aVCharHtmlAbsMap[] =
+static FrmMap aVCharHtmlAbsMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_CHAR},
{SwFPos::BELOW, SwFPos::BELOW, VertOrientation::CHAR_BOTTOM, LB_REL_CHAR}
@@ -338,7 +338,7 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] =
anchored as character
--------------------------------------------------------------------*/
-static FrmMap __FAR_DATA aVAsCharMap[] =
+static FrmMap aVAsCharMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_BASE},
{SwFPos::BOTTOM, SwFPos::BOTTOM, VertOrientation::BOTTOM, LB_REL_BASE},
@@ -355,7 +355,7 @@ static FrmMap __FAR_DATA aVAsCharMap[] =
{SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, VertOrientation::NONE, LB_REL_BASE}
};
-static FrmMap __FAR_DATA aVAsCharHtmlMap[] =
+static FrmMap aVAsCharHtmlMap[] =
{
{SwFPos::TOP, SwFPos::TOP, VertOrientation::TOP, LB_REL_BASE},
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, VertOrientation::CENTER, LB_REL_BASE},
diff --git a/binfilter/bf_basic/source/classes/sb.cxx b/binfilter/bf_basic/source/classes/sb.cxx
index c48d4ac..ef00f54 100644
--- a/binfilter/bf_basic/source/classes/sb.cxx
+++ b/binfilter/bf_basic/source/classes/sb.cxx
@@ -65,7 +65,7 @@ struct SFX_VB_ErrorItem
SbError nErrorSFX;
};
-const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] =
+const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
{
{ 1, SbERR_BASIC_EXCEPTION }, // #87844 Map exception to error code 1
{ 2, SbERR_SYNTAX },
diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx
b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 199b50c..c35fca2 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -95,7 +95,7 @@ namespace binfilter {
INT8 ScFormulaCell::nIterMode = 0;
#ifdef DBG_UTIL
-static const sal_Char __FAR_DATA msgDbgInfinity[] =
+static const sal_Char msgDbgInfinity[] =
"Formelzelle INFINITY ohne Err503 !!! (os/2?)\n"
"NICHTS anruehren und ER bescheid sagen!";
#endif
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 650a378..e09c97f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star;
#define SC_FUNCGROUP_COUNT ID_FUNCTION_GRP_ADDINS
-static const sal_Char* __FAR_DATA aFuncNames[SC_FUNCGROUP_COUNT] =
+static const sal_Char* aFuncNames[SC_FUNCGROUP_COUNT] =
{
// array index = ID - 1 (ID starts at 1)
// all upper case
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index 32bbdee..9978549 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -51,9 +51,9 @@ namespace binfilter {
sal_Char *linker_dummy = "";
// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen)
-//static const sal_Char __FAR_DATA cStandardName[] = "Standard";
+//static const sal_Char cStandardName[] = "Standard";
-static const sal_Char __FAR_DATA sAutoTblFmtName[] = "autotbl.fmt";
+static const sal_Char sAutoTblFmtName[] = "autotbl.fmt";
// bis SO5PF
const USHORT AUTOFORMAT_ID_X = 9501;
diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
index dec195f..add53b0 100644
--- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
@@ -63,7 +63,7 @@ namespace binfilter {
// Delimiters zusaetzlich zu EditEngine-Default:
-const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
+const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
//------------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
index 71b27da..ec3c15c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
@@ -1807,7 +1807,7 @@ void ScInterpreter::ScBase()
BYTE nParamCount = GetByte();
if ( MustHaveParamCount( nParamCount, 2, 3 ) )
{
- static const sal_Unicode __FAR_DATA pDigits[] = {
+ static const sal_Unicode pDigits[] = {
'0','1','2','3','4','5','6','7','8','9',
'A','B','C','D','E','F','G','H','I','J','K','L','M',
'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index 12f7eec..052bcce 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -2545,9 +2545,9 @@ void ScInterpreter::ScTTT()
// Stack aufraeumen
while ( nParamCount-- )
Pop();
- static const sal_Unicode __FAR_DATA sEyes[] = { ',',';',':','|','8','B', 0 };
- static const sal_Unicode __FAR_DATA sGoods[] = { ')',']','}', 0 };
- static const sal_Unicode __FAR_DATA sBads[] = { '(','[','{','/', 0 };
+ static const sal_Unicode sEyes[] = { ',',';',':','|','8','B', 0 };
+ static const sal_Unicode sGoods[] = { ')',']','}', 0 };
+ static const sal_Unicode sBads[] = { '(','[','{','/', 0 };
sal_Unicode aFace[4];
if ( bOk )
{
diff --git a/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
b/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
index 8d9d2cd..f068409 100644
--- a/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_zforauto.cxx
@@ -40,7 +40,7 @@
#include "global.hxx"
namespace binfilter {
-static const sal_Char __FAR_DATA pStandardName[] = "Standard";
+static const sal_Char pStandardName[] = "Standard";
//------------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
b/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
index a6ecfbe..dc5a907 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx
@@ -172,7 +172,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
//----------------------------------------------------------------------------
-static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
+static SvXMLTokenMapEntry aDocTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_FONT_DECLS, XML_TOK_DOC_FONTDECLS
},
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES
},
@@ -185,7 +185,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] =
+static SvXMLTokenMapEntry aBodyTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES
},
{ XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS },
@@ -201,13 +201,13 @@ static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationsElemTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationElemTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_HELP_MESSAGE, XML_TOK_CONTENT_VALIDATION_ELEM_HELP_MESSAGE },
{ XML_NAMESPACE_TABLE, XML_ERROR_MESSAGE, XML_TOK_CONTENT_VALIDATION_ELEM_ERROR_MESSAGE },
@@ -215,7 +215,7 @@ static __FAR_DATA SvXMLTokenMapEntry aContentValidationElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME
},
{ XML_NAMESPACE_TABLE, XML_CONDITION,
XML_TOK_CONTENT_VALIDATION_CONDITION },
@@ -224,20 +224,20 @@ static __FAR_DATA SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_P, XML_TOK_P },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE },
{ XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE
},
{ XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY
},
@@ -245,20 +245,20 @@ static __FAR_DATA SvXMLTokenMapEntry
aContentValidationErrorMessageAttrTokenMap[
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] =
+static SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aLabelRangesElemTokenMap[] =
+static SvXMLTokenMapEntry aLabelRangesElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
+static SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS,
XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE },
{ XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE
},
@@ -266,7 +266,7 @@ static __FAR_DATA SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableTokenMap[] =
+static SvXMLTokenMapEntry aTableTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP
},
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS
},
@@ -283,7 +283,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableRowsElemTokenMap[] =
+static SvXMLTokenMapEntry aTableRowsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS },
@@ -292,7 +292,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableRowsElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableColsElemTokenMap[] =
+static SvXMLTokenMapEntry aTableColsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP },
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS },
@@ -301,7 +301,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableColsElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_NAME
},
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_STYLE_NAME },
@@ -311,7 +311,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER
},
{ XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR
},
@@ -325,7 +325,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
};
-static __FAR_DATA SvXMLTokenMapEntry aTableColAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableColAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_COL_ATTR_STYLE_NAME },
{ XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED
},
@@ -334,14 +334,14 @@ static __FAR_DATA SvXMLTokenMapEntry aTableColAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableRowTokenMap[] =
+static SvXMLTokenMapEntry aTableRowTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL
},
{ XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableRowAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableRowAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_ROW_ATTR_STYLE_NAME },
{ XML_NAMESPACE_TABLE, XML_VISIBILITY,
XML_TOK_TABLE_ROW_ATTR_VISIBILITY },
@@ -351,7 +351,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableRowAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] =
+static SvXMLTokenMapEntry aTableRowCellTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P
},
{ XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_SUBTABLE
},
@@ -361,7 +361,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_AUTHOR,
XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR },
{ XML_NAMESPACE_OFFICE, XML_CREATE_DATE,
XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE },
@@ -370,14 +370,14 @@ static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDetectiveElemTokenMap[]=
+static SvXMLTokenMapEntry aDetectiveElemTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED },
{ XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION
},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
+static SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE },
{ XML_NAMESPACE_TABLE, XML_DIRECTION,
XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION },
@@ -386,14 +386,14 @@ static __FAR_DATA SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]=
+static SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF,
XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF },
@@ -405,14 +405,14 @@ static __FAR_DATA SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionsTokenMap[] =
+static SvXMLTokenMapEntry aNamedExpressionsTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAMED_RANGE,
XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE },
{ XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION,
XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
+static SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME
},
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS
},
@@ -421,7 +421,7 @@ static __FAR_DATA SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
+static SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME
},
{ XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS,
XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS },
@@ -429,13 +429,13 @@ static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangesTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangesTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL
},
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE
},
@@ -446,7 +446,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATABASE_RANGE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_IS_SELECTION,
XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION },
@@ -461,7 +461,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME,
XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_TABLE, XML_SQL_STATEMENT,
XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT },
@@ -469,21 +469,21 @@ static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME
},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME
},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aFilterTokenMap[] =
+static SvXMLTokenMapEntry aFilterTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND },
{ XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR
},
@@ -491,7 +491,7 @@ static __FAR_DATA SvXMLTokenMapEntry aFilterTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aFilterAttrTokenMap[] =
+static SvXMLTokenMapEntry aFilterAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS,
XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS },
{ XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS,
XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS },
@@ -500,7 +500,7 @@ static __FAR_DATA SvXMLTokenMapEntry aFilterAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
+static SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER },
{ XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE },
@@ -510,13 +510,13 @@ static __FAR_DATA SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSortTokenMap[] =
+static SvXMLTokenMapEntry aSortTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSortAttrTokenMap[] =
+static SvXMLTokenMapEntry aSortAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT
},
{ XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS
},
@@ -527,7 +527,7 @@ static __FAR_DATA SvXMLTokenMapEntry aSortAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
+static SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER },
{ XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE },
@@ -535,14 +535,14 @@ static __FAR_DATA SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS },
{ XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] =
+static SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT,
XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT },
{ XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE,
XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE },
@@ -550,39 +550,39 @@ static __FAR_DATA SvXMLTokenMapEntry
aDatabaseRangeSubTotalRulesAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] =
+static SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE },
{ XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] =
+static SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] =
+static SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER,
XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] =
+static SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER },
{ XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION
},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATA_PILOT_TABLE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_APPLICATION_DATA,
XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA },
@@ -594,7 +594,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL
},
{ XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE
},
@@ -605,7 +605,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_SOURCE_NAME,
XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME },
@@ -615,19 +615,19 @@ static __FAR_DATA SvXMLTokenMapEntry
aDataPilotTableSourceServiceAttrTokenMap[]
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME,
XML_TOK_DATA_PILOT_FIELD_ATTR_SOURCE_FIELD_NAME },
{ XML_NAMESPACE_TABLE, XML_IS_DATA_LAYOUT_FIELD,
XML_TOK_DATA_PILOT_FIELD_ATTR_IS_DATA_LAYOUT_FIELD },
@@ -637,44 +637,44 @@ static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL,
XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DISPLAY_EMPTY,
XML_TOK_DATA_PILOT_LEVEL_ATTR_DISPLAY_EMPTY },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS,
XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS },
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS,
XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL,
XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotSubTotalAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FUNCTION,
XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER,
XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
+static SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_NAME,
XML_TOK_DATA_PILOT_MEMBER_ATTR_NAME },
{ XML_NAMESPACE_TABLE, XML_DISPLAY,
XML_TOK_DATA_PILOT_MEMBER_ATTR_DISPLAY },
@@ -682,7 +682,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDataPilotMemberAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aConsolidationAttrTokenMap[] =
+static SvXMLTokenMapEntry aConsolidationAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_FUNCTION,
XML_TOK_CONSOLIDATION_ATTR_FUNCTION },
{ XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES,
XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES },
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 406dc66..3e3e116 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -61,30 +61,30 @@ namespace binfilter {
// Filter-Namen (wie in docsh.cxx)
-static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
-static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
-static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
-static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
-static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
-static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
-static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
-static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
-static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
-static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
-static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
-static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery";
-static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const sal_Char pFilterSc50[] = "StarCalc 5.0";
+static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
+static const sal_Char pFilterSc40[] = "StarCalc 4.0";
+static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
+static const sal_Char pFilterSc30[] = "StarCalc 3.0";
+static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
+static const sal_Char pFilterSc10[] = "StarCalc 1.0";
+static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
+static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)";
+static const sal_Char pFilterLotus[] = "Lotus";
+static const sal_Char pFilterExcel4[] = "MS Excel 4.0";
+static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95";
+static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const sal_Char pFilterExcel95[] = "MS Excel 95";
+static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const sal_Char pFilterExcel97[] = "MS Excel 97";
+static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+static const sal_Char pFilterDBase[] = "dBase";
+static const sal_Char pFilterDif[] = "DIF";
+static const sal_Char pFilterSylk[] = "SYLK";
+static const sal_Char pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char pFilterHtmlWeb[] = "calc_HTML_WebQuery";
+static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
//------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
index 456cc51..f2ad87f 100644
--- a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
+++ b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx
@@ -46,8 +46,8 @@ const sal_Int32 ASCIIDLG_MAXROWS = 10000;
const sal_Int32 ASCIIDLG_MAXROWS = 32000;
#endif
-static const sal_Char __FAR_DATA pStrFix[] = "FIX";
-static const sal_Char __FAR_DATA pStrMrg[] = "MRG";
+static const sal_Char pStrFix[] = "FIX";
+static const sal_Char pStrMrg[] = "MRG";
// ============================================================================
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 078b65f..b07d86f 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -92,35 +92,35 @@ SO2_DECL_REF(SvStorageStream)
// Stream-Namen im Storage
-const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; //
"StarCalcDocument"
-const sal_Char __FAR_DATA ScDocShell::pStyleName[] = "SfxStyleSheets";
+const sal_Char ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument"
+const sal_Char ScDocShell::pStyleName[] = "SfxStyleSheets";
// Filter-Namen (wie in sclib.cxx)
-static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
-//static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
-//static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
-//static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
-static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
-static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
-static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
-static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
-static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
-static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
-static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
-static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char __FAR_DATA pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
-static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const sal_Char pFilterSc50[] = "StarCalc 5.0";
+//static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
+static const sal_Char pFilterSc40[] = "StarCalc 4.0";
+//static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
+static const sal_Char pFilterSc30[] = "StarCalc 3.0";
+//static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
+static const sal_Char pFilterSc10[] = "StarCalc 1.0";
+static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
+static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)";
+static const sal_Char pFilterLotus[] = "Lotus";
+static const sal_Char pFilterExcel4[] = "MS Excel 4.0";
+static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95";
+static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const sal_Char pFilterExcel95[] = "MS Excel 95";
+static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const sal_Char pFilterExcel97[] = "MS Excel 97";
+static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+static const sal_Char pFilterDBase[] = "dBase";
+static const sal_Char pFilterDif[] = "DIF";
+static const sal_Char pFilterSylk[] = "SYLK";
+static const sal_Char pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
+static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
//----------------------------------------------------------------------
diff --git a/binfilter/bf_sc/source/ui/inc/docsh.hxx b/binfilter/bf_sc/source/ui/inc/docsh.hxx
index 393cdf9..a51db27 100644
--- a/binfilter/bf_sc/source/ui/inc/docsh.hxx
+++ b/binfilter/bf_sc/source/ui/inc/docsh.hxx
@@ -79,8 +79,8 @@ class ScDocShellModificator;
class ScDocShell: public SfxObjectShell, public SfxInPlaceObject, public SfxListener
{
- static const sal_Char __FAR_DATA pStarCalcDoc[];
- static const sal_Char __FAR_DATA pStyleName[];
+ static const sal_Char pStarCalcDoc[];
+ static const sal_Char pStyleName[];
ScDocument aDocument;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_servuno.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_servuno.cxx
index fff0c0a..08b175d 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_servuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_servuno.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-static const sal_Char* __FAR_DATA aProvNames[SC_SERVICE_COUNT] =
+static const sal_Char* aProvNames[SC_SERVICE_COUNT] =
{
"com.sun.star.sheet.Spreadsheet", // SC_SERVICE_SHEET
"com.sun.star.text.TextField.URL", // SC_SERVICE_URLFIELD
@@ -100,7 +100,7 @@ static const sal_Char* __FAR_DATA aProvNames[SC_SERVICE_COUNT] =
// in case some macro is still using them
//
-static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] =
+static const sal_Char* aOldNames[SC_SERVICE_COUNT] =
{
"", //
SC_SERVICE_SHEET
"stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD
diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
index c33fe7d..bcfa5c7 100644
--- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
+++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx
@@ -78,7 +78,7 @@ using namespace ::com::sun::star::uno;
// STATIC DATA -----------------------------------------------------------
-static const String __FAR_DATA aStarChartDoc = String( RTL_CONSTASCII_USTRINGPARAM(
"StarChartDocument" ));
+static const String aStarChartDoc = String( RTL_CONSTASCII_USTRINGPARAM( "StarChartDocument" ));
//----------------------------------------------------------------------
diff --git a/binfilter/bf_sd/source/ui/inc/unokywds.hxx b/binfilter/bf_sd/source/ui/inc/unokywds.hxx
index eb32eb3..0a07052 100644
--- a/binfilter/bf_sd/source/ui/inc/unokywds.hxx
+++ b/binfilter/bf_sd/source/ui/inc/unokywds.hxx
@@ -34,9 +34,9 @@
namespace binfilter {
#ifndef SD_DEFINE_KEYWORDS
-#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char n[sizeof(s)]
#else
-#define SD_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#define SD_CONSTASCII_ACTION( n, s ) sal_Char n[sizeof(s)] = s
#endif
#define UNO_PREFIX "com.sun.star."
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
index b0a2a3c..5a0506a 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx
@@ -81,7 +81,7 @@ enum WID_PAGE
#endif
#endif
-static sal_Char __FAR_DATA sEmptyPageName[sizeof("page")] = "page";
+static sal_Char sEmptyPageName[sizeof("page")] = "page";
/** this function stores the property maps for draw pages in impress and draw */
const SfxItemPropertyMap* ImplGetDrawPagePropertyMap( sal_Bool bImpress )
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 4a3dc75..0e5a313 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -53,9 +53,9 @@ namespace binfilter {
//========================================================================
-static const char __FAR_DATA pDocInfoSlot[] = "SfxDocumentInfo";
-static const char __FAR_DATA pPropSlot[] = "\005SummaryInformation";
-static const char __FAR_DATA pDocInfoHeader[] = "SfxDocumentInfo";
+static const char pDocInfoSlot[] = "SfxDocumentInfo";
+static const char pPropSlot[] = "\005SummaryInformation";
+static const char pDocInfoHeader[] = "SfxDocumentInfo";
#define VERSION 11
#define STREAM_BUFFER_SIZE 2048
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
index e86ab64..924ff62 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
@@ -64,7 +64,7 @@ using rtl::OUString;
// ------------------------------------------------------------------------
-sal_Char __FAR_DATA XMLN_VERSIONSLIST[] = "VersionList.xml";
+sal_Char XMLN_VERSIONSLIST[] = "VersionList.xml";
// ------------------------------------------------------------------------
diff --git a/binfilter/bf_starmath/source/starmath_document.cxx
b/binfilter/bf_starmath/source/starmath_document.cxx
index 8f0f2d5..588f7b3 100644
--- a/binfilter/bf_starmath/source/starmath_document.cxx
+++ b/binfilter/bf_starmath/source/starmath_document.cxx
@@ -86,7 +86,7 @@ SO2_DECL_REF(SvStorage)
#define DOCUMENT_BUFFER_SIZE (USHORT)32768
-static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
+static const char pStarMathDoc[] = "StarMathDocument";
/**************************************************************************/
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx
b/binfilter/bf_starmath/source/starmath_mathml.cxx
index b084a3e..732ff05 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -2215,7 +2215,7 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16
nPref
return pContext;
}
-static __FAR_DATA SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
+static SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS },
{ XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH },
@@ -2240,7 +2240,7 @@ static __FAR_DATA SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
+static SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_FONTWEIGHT, XML_TOK_FONTWEIGHT },
{ XML_NAMESPACE_MATH, XML_FONTSTYLE, XML_TOK_FONTSTYLE },
@@ -2250,27 +2250,27 @@ static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aFencedAttrTokenMap[] =
+static SvXMLTokenMapEntry aFencedAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_OPEN, XML_TOK_OPEN },
{ XML_NAMESPACE_MATH, XML_CLOSE, XML_TOK_CLOSE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
+static SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_STRETCHY, XML_TOK_STRETCHY },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
+static SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_ENCODING, XML_TOK_ENCODING },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresElemTokenMap[] =
+static SvXMLTokenMapEntry aPresElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_ANNOTATION, XML_TOK_ANNOTATION },
{ XML_NAMESPACE_MATH, XML_MI, XML_TOK_MI },
@@ -2283,21 +2283,21 @@ static __FAR_DATA SvXMLTokenMapEntry aPresElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
+static SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_MPRESCRIPTS, XML_TOK_MPRESCRIPTS },
{ XML_NAMESPACE_MATH, XML_NONE, XML_TOK_NONE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresTableElemTokenMap[] =
+static SvXMLTokenMapEntry aPresTableElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_MTR, XML_TOK_MTR },
{ XML_NAMESPACE_MATH, XML_MTD, XML_TOK_MTD },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aColorTokenMap[] =
+static SvXMLTokenMapEntry aColorTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_BLACK, TBLACK},
{ XML_NAMESPACE_MATH, XML_WHITE, TWHITE},
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index fae5027..b9fb4f6 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -92,7 +92,7 @@ namespace binfilter
#define UNKNOWN_SUBSTITUTE LANGUAGE_ENGLISH_US
static BOOL bIndexTableInitialized = FALSE;
-static sal_uInt32 __FAR_DATA theIndexTable[NF_INDEX_TABLE_ENTRIES];
+static sal_uInt32 theIndexTable[NF_INDEX_TABLE_ENTRIES];
// ====================================================================
diff --git a/binfilter/bf_svx/source/items/svx_paperinf.cxx
b/binfilter/bf_svx/source/items/svx_paperinf.cxx
index bf0e181..19e7ac5 100644
--- a/binfilter/bf_svx/source/items/svx_paperinf.cxx
+++ b/binfilter/bf_svx/source/items/svx_paperinf.cxx
@@ -39,7 +39,7 @@ namespace binfilter {
// STATIC DATA -----------------------------------------------------------
-static Size __FAR_DATA aDinTab[] =
+static Size aDinTab[] =
{
Size(lA0Width,lA0Height), // A0
Size(lA1Width,lA1Height), // A1
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
b/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
index 1b6b2ce..fef4f5c 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
@@ -37,7 +37,7 @@ namespace binfilter {
#define GLOBALOVERFLOW
// Vergleichsstrings
-/*N*/ sal_Unicode __FAR_DATA pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 };
+/*N*/ sal_Unicode pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 };
// Konvertiert in echte RGB-Farben, damit in den Listboxen
// endlich mal richtig selektiert werden kann.
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 7cee1dd..444126c 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -70,34 +70,34 @@ namespace binfilter {
// tippt sich schneller
#define RESOURCE ViewShell::GetShellRes()
-const sal_Char __FAR_DATA sCalc_Add[] = "add";
-const sal_Char __FAR_DATA sCalc_Sub[] = "sub";
-const sal_Char __FAR_DATA sCalc_Mul[] = "mul";
-const sal_Char __FAR_DATA sCalc_Div[] = "div";
-const sal_Char __FAR_DATA sCalc_Phd[] = "phd";
-const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt";
-const sal_Char __FAR_DATA sCalc_Pow[] = "pow";
-const sal_Char __FAR_DATA sCalc_Or[] = "or";
-const sal_Char __FAR_DATA sCalc_Xor[] = "xor";
-const sal_Char __FAR_DATA sCalc_And[] = "and";
-const sal_Char __FAR_DATA sCalc_Not[] = "not";
-const sal_Char __FAR_DATA sCalc_Eq[] = "eq";
-const sal_Char __FAR_DATA sCalc_Neq[] = "neq";
-const sal_Char __FAR_DATA sCalc_Leq[] = "leq";
-const sal_Char __FAR_DATA sCalc_Geq[] = "geq";
-const sal_Char __FAR_DATA sCalc_L[] = "l";
-const sal_Char __FAR_DATA sCalc_G[] = "g";
-const sal_Char __FAR_DATA sCalc_Sum[] = "sum";
-const sal_Char __FAR_DATA sCalc_Mean[] = "mean";
-const sal_Char __FAR_DATA sCalc_Min[] = "min";
-const sal_Char __FAR_DATA sCalc_Max[] = "max";
-const sal_Char __FAR_DATA sCalc_Sin[] = "sin";
-const sal_Char __FAR_DATA sCalc_Cos[] = "cos";
-const sal_Char __FAR_DATA sCalc_Tan[] = "tan";
-const sal_Char __FAR_DATA sCalc_Asin[] = "asin";
-const sal_Char __FAR_DATA sCalc_Acos[] = "acos";
-const sal_Char __FAR_DATA sCalc_Atan[] = "atan";
-const sal_Char __FAR_DATA sCalc_Round[] = "round";
+const sal_Char sCalc_Add[] = "add";
+const sal_Char sCalc_Sub[] = "sub";
+const sal_Char sCalc_Mul[] = "mul";
+const sal_Char sCalc_Div[] = "div";
+const sal_Char sCalc_Phd[] = "phd";
+const sal_Char sCalc_Sqrt[] = "sqrt";
+const sal_Char sCalc_Pow[] = "pow";
+const sal_Char sCalc_Or[] = "or";
+const sal_Char sCalc_Xor[] = "xor";
+const sal_Char sCalc_And[] = "and";
+const sal_Char sCalc_Not[] = "not";
+const sal_Char sCalc_Eq[] = "eq";
+const sal_Char sCalc_Neq[] = "neq";
+const sal_Char sCalc_Leq[] = "leq";
+const sal_Char sCalc_Geq[] = "geq";
+const sal_Char sCalc_L[] = "l";
+const sal_Char sCalc_G[] = "g";
+const sal_Char sCalc_Sum[] = "sum";
+const sal_Char sCalc_Mean[] = "mean";
+const sal_Char sCalc_Min[] = "min";
+const sal_Char sCalc_Max[] = "max";
+const sal_Char sCalc_Sin[] = "sin";
+const sal_Char sCalc_Cos[] = "cos";
+const sal_Char sCalc_Tan[] = "tan";
+const sal_Char sCalc_Asin[] = "asin";
+const sal_Char sCalc_Acos[] = "acos";
+const sal_Char sCalc_Atan[] = "atan";
+const sal_Char sCalc_Round[] = "round";
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
index 13825ef..1f859b0 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
@@ -138,12 +138,12 @@ extern void ClearFEShellTabCols();
|* einige Bereiche fuer die Set in Collections / Nodes
|*************************************************************************/
// AttrSet-Range fuer die 2 Break-Attribute
-USHORT __FAR_DATA aBreakSetRange[] = {
+USHORT aBreakSetRange[] = {
RES_PAGEDESC, RES_BREAK,
0 };
// AttrSet-Range fuer die TxtFmtColl
-USHORT __FAR_DATA aTxtFmtCollSetRange[] = {
+USHORT aTxtFmtCollSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -152,7 +152,7 @@ USHORT __FAR_DATA aTxtFmtCollSetRange[] = {
};
// AttrSet-Range fuer die GrfFmtColl
-USHORT __FAR_DATA aGrfFmtCollSetRange[] = {
+USHORT aGrfFmtCollSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -160,7 +160,7 @@ USHORT __FAR_DATA aGrfFmtCollSetRange[] = {
};
// AttrSet-Range fuer die TextNode
-USHORT __FAR_DATA aTxtNodeSetRange[] = {
+USHORT aTxtNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -169,14 +169,14 @@ USHORT __FAR_DATA aTxtNodeSetRange[] = {
};
// AttrSet-Range fuer die NoTxtNode
-USHORT __FAR_DATA aNoTxtNodeSetRange[] = {
+USHORT aNoTxtNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
-USHORT __FAR_DATA aTableSetRange[] = {
+USHORT aTableSetRange[] = {
RES_FILL_ORDER, RES_FRM_SIZE,
RES_LR_SPACE, RES_BREAK,
RES_BACKGROUND, RES_SHADOW,
@@ -188,7 +188,7 @@ USHORT __FAR_DATA aTableSetRange[] = {
0
};
-USHORT __FAR_DATA aTableLineSetRange[] = {
+USHORT aTableLineSetRange[] = {
RES_FILL_ORDER, RES_FRM_SIZE,
RES_LR_SPACE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
@@ -198,7 +198,7 @@ USHORT __FAR_DATA aTableLineSetRange[] = {
0
};
-USHORT __FAR_DATA aTableBoxSetRange[] = {
+USHORT aTableBoxSetRange[] = {
RES_FILL_ORDER, RES_FRM_SIZE,
RES_LR_SPACE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
@@ -210,21 +210,21 @@ USHORT __FAR_DATA aTableBoxSetRange[] = {
};
// AttrSet-Range fuer die SwFrmFmt
-USHORT __FAR_DATA aFrmFmtSetRange[] = {
+USHORT aFrmFmtSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
// AttrSet-Range fuer die SwCharFmt
-USHORT __FAR_DATA aCharFmtSetRange[] = {
+USHORT aCharFmtSetRange[] = {
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
// AttrSet-Range fuer die SwPageDescFmt
-USHORT __FAR_DATA aPgFrmFmtSetRange[] = {
+USHORT aPgFrmFmtSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
@@ -234,9 +234,9 @@ USHORT __FAR_DATA aPgFrmFmtSetRange[] = {
* lege eine Tabelle fuer einen Zugriff auf die
* Default-Format-Attribute an
******************************************************************************/
-SwDfltAttrTab __FAR_DATA aAttrTab;
+SwDfltAttrTab aAttrTab;
-SfxItemInfo __FAR_DATA aSlotTab[] =
+SfxItemInfo aSlotTab[] =
{
{ SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP
{ SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR
@@ -392,13 +392,13 @@ USHORT* SwAttrPool::pVersionMap3 = 0;
USHORT* SwAttrPool::pVersionMap4 = 0;
SwIndexReg* SwIndexReg::pEmptyIndexArray = 0;
-const sal_Char* __FAR_DATA pMarkToTable = "table";
-const sal_Char* __FAR_DATA pMarkToFrame = "frame";
-const sal_Char* __FAR_DATA pMarkToRegion = "region";
-const sal_Char* __FAR_DATA pMarkToText = "text";
-const sal_Char* __FAR_DATA pMarkToOutline = "outline";
-const sal_Char* __FAR_DATA pMarkToGraphic = "graphic";
-const sal_Char* __FAR_DATA pMarkToOLE = "ole";
+const sal_Char* pMarkToTable = "table";
+const sal_Char* pMarkToFrame = "frame";
+const sal_Char* pMarkToRegion = "region";
+const sal_Char* pMarkToText = "text";
+const sal_Char* pMarkToOutline = "outline";
+const sal_Char* pMarkToGraphic = "graphic";
+const sal_Char* pMarkToOLE = "ole";
SvPtrarr *pGlobalOLEExcludeList = 0;
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index cb23604..28584b9 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -274,7 +274,7 @@ struct ParaRstFmt
/*M*/ const SwPosition *pStt = pPam->Start(), *pEnd = pPam->End();
/*M*/ ParaRstFmt aPara( pStt, pEnd );
/*M*/
-/*N*/ USHORT __FAR_DATA aResetableSetRange[] = {
+/*N*/ USHORT aResetableSetRange[] = {
/*N*/ RES_FRMATR_BEGIN, RES_FRMATR_END-1,
/*N*/ RES_CHRATR_BEGIN, RES_CHRATR_END-1,
/*N*/ RES_PARATR_BEGIN, RES_PARATR_END-1,
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index d812324..ee00fe5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -82,12 +82,12 @@
#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
namespace binfilter {
-const sal_Char __FAR_DATA sFrmFmtStr[] = "Frameformat";
-const sal_Char __FAR_DATA sEmptyPageStr[] = "Empty Page";
-const sal_Char __FAR_DATA sColumnCntStr[] = "Columncontainer";
-const sal_Char __FAR_DATA sCharFmtStr[] = "Zeichenformat";
-const sal_Char __FAR_DATA sTxtCollStr[] = "Textformatvorlage";
-const sal_Char __FAR_DATA sGrfCollStr[] = "Graphikformatvorlage";
+const sal_Char sFrmFmtStr[] = "Frameformat";
+const sal_Char sEmptyPageStr[] = "Empty Page";
+const sal_Char sColumnCntStr[] = "Columncontainer";
+const sal_Char sCharFmtStr[] = "Zeichenformat";
+const sal_Char sTxtCollStr[] = "Textformatvorlage";
+const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ SV_IMPL_PTRARR( SwNumRuleTbl, SwNumRulePtr)
/*N*/ SV_IMPL_PTRARR( SwTxtFmtColls, SwTxtFmtCollPtr)
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index ae2404e..3daa0a2 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -58,7 +58,7 @@ namespace binfilter {
const sal_Unicode cNumRepl = '@';
const sal_Unicode cEndPageNum = '~';
-const sal_Char __FAR_DATA sPageDeli[] = ", ";
+const sal_Char sPageDeli[] = ", ";
/*N*/ SV_IMPL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr)
diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx
b/binfilter/bf_sw/source/core/doc/sw_number.cxx
index b084ab2..55a0f98 100644
--- a/binfilter/bf_sw/source/core/doc/sw_number.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx
@@ -63,10 +63,10 @@ USHORT SwNumRule::aDefNumIndents[ MAXLEVEL ] = {
};
#if defined( UNX ) && defined( GCC )
-extern const sal_Char __FAR_DATA sBulletFntName[];
-const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol";
+extern const sal_Char sBulletFntName[];
+const sal_Char sBulletFntName[] = "StarSymbol";
#else
-extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol";
+extern const sal_Char sBulletFntName[] = "StarSymbol";
#endif
/*N*/ inline void lcl_SetRuleChgd( SwTxtNode& rNd, BYTE nLevel )
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index 5cef08b..0e856cf 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -97,7 +97,7 @@ const USHORT PT_24 = 24 * 20; // 22 pt
//const USHORT HTML_PARSPACE = ((CM_05 * 7) / 10);
#define HTML_PARSPACE GetMetricVal( CM_05 )
-static const sal_Char __FAR_DATA sKomma[] = ", ";
+static const sal_Char sKomma[] = ", ";
static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
// PT_16, PT_14, PT_14, PT_12, PT_12, // normal
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 62293df..f4c859e 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -735,7 +735,7 @@ BOOL lcl_BoxSetSplitBoxFmts( const SwTableBox*& rpBox, void* pPara )
}
else
{
-USHORT __FAR_DATA aTableSplitBoxSetRange[] = {
+USHORT aTableSplitBoxSetRange[] = {
RES_LR_SPACE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
RES_PROTECT, RES_PROTECT,
diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
index 30052bf..593148c 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx
@@ -72,7 +72,7 @@ namespace binfilter {
/*N*/ SV_IMPL_REF( SwServerObject )
-//static const char __FAR_DATA sSectionFmtNm[] = "Section";
+//static const char sSectionFmtNm[] = "Section";
#define sSectionFmtNm aEmptyStr
/*N*/ class SwIntrnlSectRefLink : public SwBaseLink
diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
index 87dd6ba..50969ad 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
@@ -108,13 +108,13 @@ class SvxFontItem;
class SdrObject;
-extern sal_Char __FAR_DATA SW3HEADER[]; // 3.0/3.1 Header
-extern sal_Char __FAR_DATA SW4HEADER[]; // 4.0 Header
-extern sal_Char __FAR_DATA SW5HEADER[]; // 5.0 Header
+extern sal_Char SW3HEADER[]; // 3.0/3.1 Header
+extern sal_Char SW4HEADER[]; // 4.0 Header
+extern sal_Char SW5HEADER[]; // 5.0 Header
-extern sal_Char __FAR_DATA sSW3IO_FixedField[];
-extern sal_Char __FAR_DATA sSW3IO_AuthorityField[];
-extern sal_Char __FAR_DATA sSW3IO_DropDownField[]; // #108791#
+extern sal_Char sSW3IO_FixedField[];
+extern sal_Char sSW3IO_AuthorityField[];
+extern sal_Char sSW3IO_DropDownField[]; // #108791#
// die Block-Groessen fuer die einzelnen Stream (Lesen/Schreiben)
#define SW3_BSR_STYLES 16384
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx
index 78ed777..e585f79 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx
@@ -46,7 +46,7 @@ namespace binfilter {
#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE )
#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE )
-sal_Char __FAR_DATA N_BLOCKINFO[] = "AutotextInfo";
+sal_Char N_BLOCKINFO[] = "AutotextInfo";
/*************************************************************************
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index e014201..ca251e9 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -80,10 +80,10 @@ namespace binfilter {
#define SWG_AUTHORITY_ENTRY_LCL 'E'
-sal_Char __FAR_DATA sSW3IO_FixedField[] = "FixedExport";
-sal_Char __FAR_DATA sSW3IO_AuthorityField[] = "AuthorityExport";
+sal_Char sSW3IO_FixedField[] = "FixedExport";
+sal_Char sSW3IO_AuthorityField[] = "AuthorityExport";
/* #108791# */
-sal_Char __FAR_DATA sSW3IO_DropDownField[] = "DropDownExport";
+sal_Char sSW3IO_DropDownField[] = "DropDownExport";
struct OldFormats
{
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 0bed171..b1215e4 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -101,9 +101,9 @@ static Sw3IoImp* pCurIosys; // fuer
non-poolable Attrs
static sal_uInt32 nFltFlags = 0;
-sal_Char __FAR_DATA SW3HEADER[] = "SW3HDR"; // 3.0/3.1 Header
-sal_Char __FAR_DATA SW4HEADER[] = "SW4HDR"; // 4.0 Header
-sal_Char __FAR_DATA SW5HEADER[] = "SW5HDR"; // 5.0 Header
+sal_Char SW3HEADER[] = "SW3HDR"; // 3.0/3.1 Header
+sal_Char SW4HEADER[] = "SW4HDR"; // 4.0 Header
+sal_Char SW5HEADER[] = "SW5HDR"; // 5.0 Header
// TODOs fuer 6.0-FF
// - Record-Laengen > 16MB richtig handeln.
diff --git a/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
b/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
index 3a51d11..4db4d14 100644
--- a/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx
@@ -45,7 +45,7 @@ namespace binfilter {
// steht im number.cxx
-extern const sal_Char __FAR_DATA sBulletFntName[];
+extern const sal_Char sBulletFntName[];
extern bool bOneBeepOnly;
diff --git a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
index a721a47..faec3df 100644
--- a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx
@@ -82,7 +82,7 @@ using namespace ::com::sun::star::beans;
#endif
// steht im number.cxx
-extern const sal_Char __FAR_DATA sBulletFntName[];
+extern const sal_Char sBulletFntName[];
// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx>
//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh );
diff --git a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
index 5d24e1d..875b149 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtio.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtio.cxx
@@ -38,7 +38,7 @@
#error Wer fummelt denn an den makefiles?
#endif
-#define CONSTCHAR( name, string ) static const sal_Char __FAR_DATA name[] = string
+#define CONSTCHAR( name, string ) static const sal_Char name[] = string
#include <horiornt.hxx>
diff --git a/binfilter/bf_sw/source/core/text/txtcfg.hxx
b/binfilter/bf_sw/source/core/text/txtcfg.hxx
index c98c876..fac155d 100644
--- a/binfilter/bf_sw/source/core/text/txtcfg.hxx
+++ b/binfilter/bf_sw/source/core/text/txtcfg.hxx
@@ -44,7 +44,7 @@ namespace binfilter {
// Toleranzwert in der Formatierung und Textausgabe.
#define SLOPPY_TWIPS 5
-#define CONSTCHAR( name, string ) static const sal_Char __FAR_DATA name[] = string
+#define CONSTCHAR( name, string ) static const sal_Char name[] = string
// Allgemeines ...
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
index eaa6c01..1b01e08 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star::lang;
using rtl::OUString;
-const char* __FAR_DATA aProvNames[] =
+const char* aProvNames[] =
{
"com.sun.star.text.TextTable", //SW_SERVICE_TYPE_TEXTTABLE
"com.sun.star.text.TextFrame", //SW_SERVICE_TYPE_TEXTFRAME
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
index 4d1fdbb..4428bae 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx
@@ -129,8 +129,8 @@ using ::com::sun::star::frame::XModel;
using ::com::sun::star::container::XNameAccess;
using ::com::sun::star::style::XStyleFamiliesSupplier;
-const sal_Char __FAR_DATA sPackageProtocol[] = "vnd.sun.star.Package:";
-const sal_Char __FAR_DATA sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:";
+const sal_Char sPackageProtocol[] = "vnd.sun.star.Package:";
+const sal_Char sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:";
/****************************************************************************
Rahmenbeschreibung
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index a8956cf..b1a71dd 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -108,7 +108,7 @@ namespace binfilter {
// Globals ******************************************************************
- static const SwLineType __FAR_DATA aLineTypeArr[] =
+ static const SwLineType aLineTypeArr[] =
{
// In Out Dist
{LIN_0, LIN_1, LIN_0}, // Einfache Linien
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
index 4026ec9..e7815b8 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
@@ -152,7 +152,7 @@ static Writer& OutW4W_SwFtn( Writer& rWrt, const SfxPoolItem& rHt )
if( nStart >= nEnd )
break;
- static sal_Char __FAR_DATA cFNT[] = "FNT00\x1f"; // FootNote
+ static sal_Char cFNT[] = "FNT00\x1f"; // FootNote
if ( rW4WWrt.pDoc->GetFtnInfo().ePos != FTNPOS_PAGE )
cFNT[ 4 ] = '2'; // EndNote
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
b/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
index c1b2bf7..b86832a 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx
@@ -77,8 +77,8 @@
#include <statstr.hrc> // ResId fuer Statusleiste
namespace binfilter {
-const sal_Char __FAR_DATA sW4W_RECBEGIN[3] = { cW4W_BEGICF, cW4W_LED, 0 };
-const sal_Char __FAR_DATA sW4W_TERMEND[3] = { cW4W_TXTERM, cW4W_RED, 0 };
+const sal_Char sW4W_RECBEGIN[3] = { cW4W_BEGICF, cW4W_LED, 0 };
+const sal_Char sW4W_TERMEND[3] = { cW4W_TXTERM, cW4W_RED, 0 };
//-------------------------------------------------------------------
diff --git a/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
b/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
index b211b98..4873435 100644
--- a/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
+++ b/binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx
@@ -86,8 +86,8 @@ extern SwNodeFnTab aW4WNodeFnTab;
#endif
-extern const sal_Char __FAR_DATA sW4W_RECBEGIN[3]; // W4W_BEGICF W4W_LED
-extern const sal_Char __FAR_DATA sW4W_TERMEND[3]; // W4W_TXTREM W4W_RED
+extern const sal_Char sW4W_RECBEGIN[3]; // W4W_BEGICF W4W_LED
+extern const sal_Char sW4W_TERMEND[3]; // W4W_TXTREM W4W_RED
// der W4W-Writer
diff --git a/binfilter/bf_sw/source/filter/xml/sw_swxmlat.cxx
b/binfilter/bf_sw/source/filter/xml/sw_swxmlat.cxx
index 83397d2..2acd5b1 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_swxmlat.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_swxmlat.cxx
@@ -178,7 +178,7 @@ sal_Bool SwFmtLayoutSplit::exportXML(
// ---------------------------------------------------------------------
-static __FAR_DATA struct SvXMLEnumMapEntry aXMLTableAlignMap[] =
+static struct SvXMLEnumMapEntry aXMLTableAlignMap[] =
{
{ XML_LEFT, HORI_LEFT },
{ XML_LEFT, HORI_LEFT_AND_WIDTH },
@@ -215,7 +215,7 @@ sal_Bool SwFmtHoriOrient::exportXML(
// ---------------------------------------------------------------------
-static __FAR_DATA SvXMLEnumMapEntry aXMLTableVAlignMap[] =
+static SvXMLEnumMapEntry aXMLTableVAlignMap[] =
{
{ XML_TOP, VERT_TOP },
{ XML_MIDDLE, VERT_CENTER },
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
b/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
index 86576a6..6fd7c5e 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx
@@ -71,7 +71,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_NGIMG_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
+static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
index a36c616..12e547b 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
@@ -121,7 +121,7 @@ enum SwXMLDocTokens
XML_TOK_OFFICE_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
+static SvXMLTokenMapEntry aDocTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_FONT_DECLS, XML_TOK_DOC_FONTDECLS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
b/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
index b9fc4cb..51785d6 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx
@@ -108,7 +108,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_META_STAT_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] =
+static SvXMLTokenMapEntry aMetaStatAttrTokenMap[] =
{
{ XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE },
{ XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE },
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
index d769758..c840218 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx
@@ -129,7 +129,7 @@ enum SwXMLTableCellAttrTokens
XML_TOK_TABLE_CELL_ATTR_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
+static SvXMLTokenMapEntry aTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS,
XML_TOK_TABLE_HEADER_COLS },
@@ -152,7 +152,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME },
{ XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, XML_TOK_TABLE_NUM_COLS_SPANNED },
diff --git a/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
b/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
index c786aae..ccc2244 100644
--- a/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx
@@ -46,7 +46,7 @@ namespace binfilter {
#define C2S(cChar) String::CreateFromAscii(cChar)
-extern char __FAR_DATA sHTML[];
+extern char sHTML[];
SwDLL::SwDLL()
{
diff --git a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
index 0287c48..d68b4bf 100644
--- a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
@@ -79,7 +79,7 @@ namespace binfilter {
#define MIN_TABWIDTH 120
#define MIN_TABHEIGHT 200
-static const char __FAR_DATA aPostItStr[] = " ";
+static const char aPostItStr[] = " ";
/*************************************************************************
* SwViewOption::IsEqualFlags()
diff --git a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
index d8d6840..65b6c6a 100644
--- a/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
+++ b/binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx
@@ -99,7 +99,7 @@ using namespace ::com::sun::star::sdbc;
/*--------------------------------------------------------------------
Beschreibung: Formate in der richtigen Reihenfolge
--------------------------------------------------------------------*/
-/*N*/ static const USHORT __FAR_DATA aSetFmt[] =
+/*N*/ static const USHORT aSetFmt[] =
/*N*/ {
/*N*/ // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_???
/*N*/ // uebereinstimmen
@@ -107,14 +107,14 @@ using namespace ::com::sun::star::sdbc;
/*N*/ 0
/*N*/ };
/*N*/
-/*N*/ static const USHORT __FAR_DATA aGetFmt[] =
+/*N*/ static const USHORT aGetFmt[] =
/*N*/ {
/*N*/ // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_???
/*N*/ // uebereinstimmen
/*N*/ 0
/*N*/ };
/*N*/
-/*N*/ static const USHORT __FAR_DATA aUsrFmt[] =
+/*N*/ static const USHORT aUsrFmt[] =
/*N*/ {
/*N*/ // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_???
/*N*/ // uebereinstimmen
@@ -122,7 +122,7 @@ using namespace ::com::sun::star::sdbc;
/*N*/ SUB_CMD
/*N*/ };
/*N*/
-/*N*/ static const USHORT __FAR_DATA aDBFmt[] =
+/*N*/ static const USHORT aDBFmt[] =
/*N*/ {
/*N*/ // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_???
/*N*/ // uebereinstimmen
@@ -150,7 +150,7 @@ struct SwFldPack
/*--------------------------------------------------------------------
Beschreibung: Strings und Formate
--------------------------------------------------------------------*/
-static const SwFldPack __FAR_DATA aSwFlds[] =
+static const SwFldPack aSwFlds[] =
{
// Dokument
{TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0,
0},
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
index f296c4f..04715a5 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
// Breitenangaben der Fussnotenlinien, mit TabPage abstimmen
-static const USHORT __FAR_DATA nFtnLines[] = {
+static const USHORT nFtnLines[] = {
0,
10,
50,
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
index cb9e879..aebd0e1 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx
@@ -69,7 +69,7 @@ enum SchXMLChartType
// ----------------------------------------
-static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] =
+static SvXMLEnumMapEntry aXMLChartClassMap[] =
{
{ XML_LINE, XML_CHART_CLASS_LINE },
{ XML_AREA, XML_CHART_CLASS_AREA },
@@ -84,7 +84,7 @@ static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-static __FAR_DATA SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
+static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
{
{ XML_LEFT, chart::ChartLegendPosition_LEFT },
{ XML_TOP, chart::ChartLegendPosition_TOP },
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
index f91cec1..844a83f 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx
@@ -52,7 +52,7 @@ using namespace ::binfilter::xmloff::token;
// element maps
// ----------------------------------------
-static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
+static SvXMLTokenMapEntry aDocElemTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
@@ -61,7 +61,7 @@ static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
+static SvXMLTokenMapEntry aTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS },
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS
},
@@ -72,7 +72,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aChartElemTokenMap[] =
+static SvXMLTokenMapEntry aChartElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA
},
{ XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE
},
@@ -82,7 +82,7 @@ static __FAR_DATA SvXMLTokenMapEntry aChartElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
+static SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_AXIS, XML_TOK_PA_AXIS
},
{ XML_NAMESPACE_CHART, XML_SERIES, XML_TOK_PA_SERIES
},
@@ -96,7 +96,7 @@ static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSeriesElemTokenMap[] =
+static SvXMLTokenMapEntry aSeriesElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT },
{ XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN },
@@ -110,7 +110,7 @@ static __FAR_DATA SvXMLTokenMapEntry aSeriesElemTokenMap[] =
// attribute maps
// ----------------------------------------
-static __FAR_DATA SvXMLTokenMapEntry aChartAttrTokenMap[] =
+static SvXMLTokenMapEntry aChartAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS
},
{ XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CHART_WIDTH
},
@@ -122,7 +122,7 @@ static __FAR_DATA SvXMLTokenMapEntry aChartAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
+static SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y
},
@@ -136,7 +136,7 @@ static __FAR_DATA SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aAxisAttrTokenMap[] =
+static SvXMLTokenMapEntry aAxisAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_AXIS_CLASS
},
{ XML_NAMESPACE_CHART, XML_NAME, XML_TOK_AXIS_NAME
},
@@ -144,7 +144,7 @@ static __FAR_DATA SvXMLTokenMapEntry aAxisAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aLegendAttrTokenMap[] =
+static SvXMLTokenMapEntry aLegendAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_LEGEND_POSITION, XML_TOK_LEGEND_POSITION },
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_LEGEND_X
},
@@ -153,14 +153,14 @@ static __FAR_DATA SvXMLTokenMapEntry aLegendAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aCellAttrTokenMap[] =
+static SvXMLTokenMapEntry aCellAttrTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE
},
{ XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CELL_VALUE
},
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
+static SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE },
{ XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS },
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
index 8efc21e..54b2a1e 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx
@@ -53,7 +53,7 @@ using namespace ::binfilter::xmloff::token;
using ::rtl::OUString;
-static __FAR_DATA SvXMLEnumMapEntry aXMLAxisClassMap[] =
+static SvXMLEnumMapEntry aXMLAxisClassMap[] =
{
{ XML_CATEGORY, SCH_XML_AXIS_CATEGORY },
{ XML_DOMAIN, SCH_XML_AXIS_DOMAIN },
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
b/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
index 60dbcb0..d5161b9 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx
@@ -47,7 +47,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_SYMBOL_IMAGE_END = XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
+static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, ::binfilter::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF
},
{ XML_NAMESPACE_XLINK, ::binfilter::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE
},
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
index 4bf5f00..68134f5 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
@@ -97,7 +97,7 @@ enum XMLImageMapToken
XML_TOK_IMAP_TARGET
};
-static __FAR_DATA SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
+static SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL
},
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME
},
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
index 3113559..783940c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx
@@ -71,7 +71,7 @@ using namespace ::binfilter::xmloff::token;
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
+static SvXMLTokenMapEntry aDocElemTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES
},
{ XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
@@ -83,14 +83,14 @@ static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aBodyElemTokenMap[] =
+static SvXMLTokenMapEntry aBodyElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_PAGE, XML_TOK_BODY_PAGE },
{ XML_NAMESPACE_PRESENTATION, XML_SETTINGS, XML_TOK_BODY_SETTINGS },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aStylesElemTokenMap[] =
+static SvXMLTokenMapEntry aStylesElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_PAGE_MASTER,
XML_TOK_STYLES_PAGE_MASTER },
{ XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT,
XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT },
@@ -98,14 +98,14 @@ static __FAR_DATA SvXMLTokenMapEntry aStylesElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
+static SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_MASTERPAGE_STYLE
},
{ XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_MASTERPAGE_NOTES },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
+static SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_NAME,
XML_TOK_MASTERPAGE_NAME },
{ XML_NAMESPACE_STYLE, XML_PAGE_MASTER_NAME,
XML_TOK_MASTERPAGE_PAGE_MASTER_NAME },
@@ -114,13 +114,13 @@ static __FAR_DATA SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
+static SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_NAME,
XML_TOK_PAGEMASTER_NAME },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
+static SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_FO, XML_MARGIN_TOP,
XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP },
{ XML_NAMESPACE_FO, XML_MARGIN_BOTTOM,
XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM },
@@ -132,7 +132,7 @@ static __FAR_DATA SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
+static SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME,
XML_TOK_DRAWPAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME,
XML_TOK_DRAWPAGE_STYLE_NAME },
@@ -143,13 +143,13 @@ static __FAR_DATA SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
+static SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
{
{ XML_NAMESPACE_PRESENTATION, XML_NOTES,
XML_TOK_DRAWPAGE_NOTES },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
+static SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
{
{ XML_NAMESPACE_PRESENTATION, XML_OBJECT, XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME
},
{ XML_NAMESPACE_SVG, XML_X,
XML_TOK_PRESENTATIONPLACEHOLDER_X },
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
index 545f7de..4362390 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx
@@ -271,7 +271,7 @@ XMLShapeImportHelper::~XMLShapeImportHelper()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
+static SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_G, XML_TOK_GROUP_GROUP
},
{ XML_NAMESPACE_DRAW, XML_RECT, XML_TOK_GROUP_RECT
},
@@ -311,7 +311,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
+static SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_3DSCENE_3DSCENE
},
{ XML_NAMESPACE_DR3D, XML_CUBE, XML_TOK_3DSCENE_3DCUBE
},
@@ -330,7 +330,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
//////////////////////////////////////////////////////////////////////////////
/*
-static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] =
+static SvXMLTokenMapEntry aShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME,
XML_TOK_SHAPE_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME,
XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS },
@@ -351,7 +351,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap()
*/
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
+static SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME,
XML_TOK_3DOBJECT_DRAWSTYLE_NAME },
{ XML_NAMESPACE_DR3D, XML_TRANSFORM,
XML_TOK_3DOBJECT_TRANSFORM },
@@ -367,7 +367,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
+static SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX,
XML_TOK_3DPOLYGONBASED_VIEWBOX },
{ XML_NAMESPACE_SVG, XML_D,
XML_TOK_3DPOLYGONBASED_D },
@@ -383,7 +383,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
+static SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_MIN_EDGE,
XML_TOK_3DCUBEOBJ_MINEDGE },
{ XML_NAMESPACE_DR3D, XML_MAX_EDGE,
XML_TOK_3DCUBEOBJ_MAXEDGE },
@@ -399,7 +399,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
+static SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_CENTER,
XML_TOK_3DSPHEREOBJ_CENTER },
{ XML_NAMESPACE_DR3D, XML_SIZE,
XML_TOK_3DSPHEREOBJ_SIZE },
@@ -415,7 +415,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
+static SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TOK_3DLIGHT_DIFFUSE_COLOR
},
{ XML_NAMESPACE_DR3D, XML_DIRECTION, XML_TOK_3DLIGHT_DIRECTION
},
@@ -433,7 +433,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
/*
-static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
+static SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_PAGESHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_PAGESHAPE_Y
},
@@ -451,7 +451,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap()
//////////////////////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
+static SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_GOSHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_GOSHAPE_Y
},
diff --git a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
index 919422e..276f88a 100644
--- a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
+++ b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
@@ -130,7 +130,7 @@ enum SfxXMLMetaElemTokens
// XML_TOK_META_KEYWORD is not in map,
// handled in SfxXMLMetaElementContext::CreateChildContext
-static __FAR_DATA SvXMLTokenMapEntry aMetaElemTokenMap[] =
+static SvXMLTokenMapEntry aMetaElemTokenMap[] =
{
{ XML_NAMESPACE_DC, XML_TITLE, XML_TOK_META_TITLE },
{ XML_NAMESPACE_DC, XML_DESCRIPTION, XML_TOK_META_DESCRIPTION },
@@ -161,7 +161,7 @@ enum SfxXMLMetaTemplateTokens
XML_TOK_META_TEMPLATE_END = XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aMetaTemplateTokenMap[] =
+static SvXMLTokenMapEntry aMetaTemplateTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_META_TEMPLATE_HREF },
{ XML_NAMESPACE_XLINK, XML_TITLE, XML_TOK_META_TEMPLATE_TITLE },
@@ -176,7 +176,7 @@ enum SfxXMLMetaReloadTokens
XML_TOK_META_RELOAD_END = XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aMetaReloadTokenMap[] =
+static SvXMLTokenMapEntry aMetaReloadTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_META_RELOAD_HREF },
{ XML_NAMESPACE_META, XML_DELAY, XML_TOK_META_RELOAD_DELAY },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
b/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
index 519d702..d00fea6 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx
@@ -66,7 +66,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_DASH_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aDashStyleAttrTokenMap[] =
+static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_DASH_STYLE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
b/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
index 70d2568..bb9ec08 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx
@@ -70,7 +70,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aGradientAttrTokenMap[] =
+static SvXMLTokenMapEntry aGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_GRADIENT_STYLE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
b/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
index 81ac712..543cee6 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx
@@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_HATCH_STYLE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_ImageStyle.cxx
b/binfilter/bf_xmloff/source/style/xmloff_ImageStyle.cxx
index 575cdf4..7b0cfeb 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_ImageStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_ImageStyle.cxx
@@ -63,7 +63,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAGE_URL },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
b/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
index 8c4adcc..44ebe13 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx
@@ -66,7 +66,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
+static SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_GRADIENT_STYLE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
b/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
index b1f6604..37123e5 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
@@ -59,7 +59,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_NGIMG_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
+static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
b/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
index 6871f37..7d53aad 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx
@@ -62,7 +62,7 @@ enum XMLFontStyleAttrTokens
XML_TOK_FONT_STYLE_ATTR_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
+static SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_FO, XML_FONT_FAMILY,
XML_TOK_FONT_STYLE_ATTR_FAMILY },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
index 368441a..1b220c7 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
@@ -320,7 +320,7 @@ static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
// token maps
//
-static __FAR_DATA SvXMLTokenMapEntry aStylesElemMap[] =
+static SvXMLTokenMapEntry aStylesElemMap[] =
{
// style elements
{ XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE, XML_TOK_STYLES_NUMBER_STYLE },
@@ -333,7 +333,7 @@ static __FAR_DATA SvXMLTokenMapEntry aStylesElemMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aStyleElemMap[] =
+static SvXMLTokenMapEntry aStyleElemMap[] =
{
// elements in a style
{ XML_NAMESPACE_NUMBER, XML_TEXT, XML_TOK_STYLE_TEXT
},
@@ -359,7 +359,7 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleElemMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aStyleAttrMap[] =
+static SvXMLTokenMapEntry aStyleAttrMap[] =
{
// attributes for a style
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_STYLE_ATTR_NAME
},
@@ -377,7 +377,7 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleAttrMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aStyleElemAttrMap[] =
+static SvXMLTokenMapEntry aStyleElemAttrMap[] =
{
// attributes for an element within a style
{ XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
XML_TOK_ELEM_ATTR_DECIMAL_PLACES },
@@ -398,14 +398,14 @@ static __FAR_DATA SvXMLTokenMapEntry aStyleElemAttrMap[] =
// maps for SvXMLUnitConverter::convertEnum
-static __FAR_DATA SvXMLEnumMapEntry aStyleValueMap[] =
+static SvXMLEnumMapEntry aStyleValueMap[] =
{
{ XML_SHORT, sal_False },
{ XML_LONG, sal_True },
{ XML_TOKEN_INVALID, 0 }
};
-static __FAR_DATA SvXMLEnumMapEntry aFormatSourceMap[] =
+static SvXMLEnumMapEntry aFormatSourceMap[] =
{
{ XML_FIXED, sal_False },
{ XML_LANGUAGE, sal_True },
@@ -427,7 +427,7 @@ struct SvXMLDefaultDateFormat
sal_Bool bSystem;
};
-static __FAR_DATA SvXMLDefaultDateFormat aDefaultDateFormats[] =
+static SvXMLDefaultDateFormat aDefaultDateFormats[] =
{
// format day-of-week day
month year hours
minutes seconds format-source
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index 927b109..befcdc6 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -131,7 +131,7 @@ enum SvxXMLTextListLevelStyleAttrTokens
XML_TOK_TEXT_LEVEL_ATTR_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aLevelAttrTokenMap[] =
+static SvXMLTokenMapEntry aLevelAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_LEVEL_ATTR_LEVEL },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME },
@@ -589,7 +589,7 @@ enum SvxXMLStyleAttributesAttrTokens
XML_TOK_STYLE_ATTRIBUTES_ATTR_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
+static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_SPACE_BEFORE,
XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
b/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
index b2c091b..bc10b3e 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
@@ -68,7 +68,7 @@ using rtl::OUString;
// ---------------------------------------------------------------------
-static __FAR_DATA SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
+static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE
},
{ XML_NAMESPACE_STYLE, XML_PAGE_MASTER, XML_TOK_STYLE_PAGE_MASTER },
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
b/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
index 6ed6ca5..62772e5 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx
@@ -57,7 +57,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] =
+static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION },
{ XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
index 569626f..6435c16 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx
@@ -195,7 +195,7 @@ enum XMLFtnConfigToken
XML_TOK_FTNCONFIG_POSITION
};
-static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, XML_TOK_FTNCONFIG_CITATION_STYLENAME },
{ XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
index 7c0eaa2..8e01f7a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx
@@ -76,7 +76,7 @@ enum XMLFootnoteChildToken {
XML_TOK_FTN_ENDNOTE_BODY
};
-static __FAR_DATA SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
+static SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_FOOTNOTE_CITATION,
XML_TOK_FTN_FOOTNOTE_CITATION },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
index 92c62fe..f179923 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx
@@ -63,7 +63,7 @@ using ::com::sun::star::xml::sax::XAttributeList;
const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter";
const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops";
-static __FAR_DATA SvXMLTokenMapEntry aIndexSourceTokenMap[] =
+static SvXMLTokenMapEntry aIndexSourceTokenMap[] =
{
{ XML_NAMESPACE_TEXT,
XML_OUTLINE_LEVEL,
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionImportContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionImportContext.cxx
index 92acd6f..48708c1 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionImportContext.cxx
@@ -89,7 +89,7 @@ enum XMLSectionToken
XML_TOK_SECTION_IS_HIDDEN
};
-static __FAR_DATA SvXMLTokenMapEntry aSectionTokenMap[] =
+static SvXMLTokenMapEntry aSectionTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME },
{ XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_SECTION_NAME },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceDDEImportContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceDDEImportContext.cxx
index 0bd849a..a05aadd 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceDDEImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceDDEImportContext.cxx
@@ -92,7 +92,7 @@ enum XMLSectionSourceDDEToken
XML_TOK_SECTION_IS_AUTOMATIC_UPDATE
};
-static __FAR_DATA SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
+static SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
XML_TOK_SECTION_DDE_APPLICATION },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceImportContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceImportContext.cxx
index 49f7993..81cbeec 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceImportContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceImportContext.cxx
@@ -78,7 +78,7 @@ enum XMLSectionSourceToken
XML_TOK_SECTION_TEXT_SECTION_NAME
};
-static __FAR_DATA SvXMLTokenMapEntry aSectionSourceTokenMap[] =
+static SvXMLTokenMapEntry aSectionSourceTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF },
{ XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
b/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
index 6ac934d..cdcb0bc 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx
@@ -65,7 +65,7 @@ enum SvXMLSepTokenMapAttrs
XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] =
+static SvXMLTokenMapEntry aColAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH },
{ XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_TOK_COLUMN_MARGIN_LEFT },
@@ -73,7 +73,7 @@ static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aColSepAttrTokenMap[] =
+static SvXMLTokenMapEntry aColSepAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH },
{ XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
b/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
index 80b1979..734c747 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx
@@ -51,7 +51,7 @@ enum SvXMLTokenMapDropAttrs
XML_TOK_DROP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aDropAttrTokenMap[] =
+static SvXMLTokenMapEntry aDropAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_LINES, XML_TOK_DROP_LINES },
{ XML_NAMESPACE_STYLE, XML_LENGTH, XML_TOK_DROP_LENGTH },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
b/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
index 247dd82..379967d 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx
@@ -233,7 +233,7 @@ const sal_Char sAPI_is_visible[] = "IsVisible";
const sal_Char sAPI_true[] = "TRUE";
-static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
{ XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION },
@@ -3050,7 +3050,7 @@ enum DdeFieldDeclAttrs
XML_TOK_DDEFIELD_UPDATE
};
-static __FAR_DATA SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
+static SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_DDEFIELD_NAME },
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
b/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
index 50b60b3..62c094a 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx
@@ -85,7 +85,7 @@ using ::comphelper::UStringLess;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] =
+static SvXMLTokenMapEntry aTextElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_P, XML_TOK_TEXT_P
},
{ XML_NAMESPACE_TEXT, XML_H, XML_TOK_TEXT_H
},
@@ -125,7 +125,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
+static SvXMLTokenMapEntry aTextPElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN },
{ XML_NAMESPACE_TEXT, XML_TAB_STOP, XML_TOK_TEXT_TAB_STOP },
@@ -302,7 +302,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextPAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_P_STYLE_NAME },
{ XML_NAMESPACE_TEXT, XML_COND_STYLE_NAME,
@@ -311,7 +311,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME,
XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME },
@@ -320,14 +320,14 @@ static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
+static SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER },
{ XML_NAMESPACE_TEXT, XML_LIST_ITEM, XML_TOK_TEXT_LIST_ITEM },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME },
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME },
@@ -358,7 +358,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH },
{ XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT },
@@ -369,7 +369,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME },
@@ -381,7 +381,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
+static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER },
{ XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER },
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
b/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
index 04177e5..b9bc10e 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx
@@ -62,7 +62,7 @@ using rtl::OUString;
//using namespace ::com::sun::star::text;
using namespace ::binfilter::xmloff::token;
-static __FAR_DATA SvXMLEnumMapEntry aCategoryMap[] =
+static SvXMLEnumMapEntry aCategoryMap[] =
{
{ XML_TEXT, ParagraphStyleCategory::TEXT },
{ XML_CHAPTER, ParagraphStyleCategory::CHAPTER },
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx
b/binfilter/binfilterdetect/source/bindetect.cxx
index e233384..ed80bc9 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -438,7 +438,7 @@ bool checkFormat( SvStream* pStream, ::rtl::OUString& rTypeName, ::rtl::OUString
::rtl::OUString aName( rTypeName );
rTypeName = ::rtl::OUString();
- const sal_Char __FAR_DATA FILTER_SWG[] = "SWG";
+ const sal_Char FILTER_SWG[] = "SWG";
if ( bCheckAll || aName.equalsAsciiL( aFileTypeList[0].Type, aFileTypeList[0].Length ) )
{
// StarWriter 1.0
diff --git a/binfilter/inc/bf_sc/editutil.hxx b/binfilter/inc/bf_sc/editutil.hxx
index d3f3ab7..47b8031 100644
--- a/binfilter/inc/bf_sc/editutil.hxx
+++ b/binfilter/inc/bf_sc/editutil.hxx
@@ -61,7 +61,7 @@ class ScEditUtil
Fraction aZoomX;
Fraction aZoomY;
- static const char __FAR_DATA pCalcDelimiters[];
+ static const char pCalcDelimiters[];
public:
static String ModifyDelimiters( const String& rOld );
diff --git a/binfilter/inc/bf_svtools/htmlout.hxx b/binfilter/inc/bf_svtools/htmlout.hxx
index e45f672..6230442 100644
--- a/binfilter/inc/bf_svtools/htmlout.hxx
+++ b/binfilter/inc/bf_svtools/htmlout.hxx
@@ -60,7 +60,7 @@ struct HTMLOutFuncs
#if defined(MAC) || defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
};
}
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 0e54ddd..74c654e 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -56,7 +56,7 @@ class XOutputDevice;
#define BITMAP_HEIGHT 12
// Standard-Vergleichsstring
-extern sal_Unicode __FAR_DATA pszStandard[]; // "standard"
+extern sal_Unicode pszStandard[]; // "standard"
// Funktion zum Konvertieren in echte RGB-Farben, da mit
// enum COL_NAME nicht verglichen werden kann.
diff --git a/binfilter/inc/bf_sw/calc.hxx b/binfilter/inc/bf_sw/calc.hxx
index 7fdb45b..38539ac 100644
--- a/binfilter/inc/bf_sw/calc.hxx
+++ b/binfilter/inc/bf_sw/calc.hxx
@@ -70,35 +70,35 @@ enum SwCalcOper
//-- Calculate Operations Strings -----------------------------------------
-extern const sal_Char __FAR_DATA sCalc_Add[];
-extern const sal_Char __FAR_DATA sCalc_Sub[];
-extern const sal_Char __FAR_DATA sCalc_Mul[];
-extern const sal_Char __FAR_DATA sCalc_Div[];
-extern const sal_Char __FAR_DATA sCalc_Phd[];
-extern const sal_Char __FAR_DATA sCalc_Sqrt[];
-extern const sal_Char __FAR_DATA sCalc_Pow[];
-extern const sal_Char __FAR_DATA sCalc_Or[];
-extern const sal_Char __FAR_DATA sCalc_Xor[];
-extern const sal_Char __FAR_DATA sCalc_And[];
-extern const sal_Char __FAR_DATA sCalc_Not[];
-extern const sal_Char __FAR_DATA sCalc_Eq[];
-extern const sal_Char __FAR_DATA sCalc_Neq[];
-extern const sal_Char __FAR_DATA sCalc_Leq[];
-extern const sal_Char __FAR_DATA sCalc_Geq[];
-extern const sal_Char __FAR_DATA sCalc_L[];
-extern const sal_Char __FAR_DATA sCalc_G[];
-extern const sal_Char __FAR_DATA sCalc_Sum[];
-extern const sal_Char __FAR_DATA sCalc_Mean[];
-extern const sal_Char __FAR_DATA sCalc_Min[];
-extern const sal_Char __FAR_DATA sCalc_Max[];
-extern const sal_Char __FAR_DATA sCalc_Sin[];
-extern const sal_Char __FAR_DATA sCalc_Cos[];
-extern const sal_Char __FAR_DATA sCalc_Tan[];
-extern const sal_Char __FAR_DATA sCalc_Asin[];
-extern const sal_Char __FAR_DATA sCalc_Acos[];
-extern const sal_Char __FAR_DATA sCalc_Atan[];
-extern const sal_Char __FAR_DATA sCalc_Tdif[];
-extern const sal_Char __FAR_DATA sCalc_Round[];
+extern const sal_Char sCalc_Add[];
+extern const sal_Char sCalc_Sub[];
+extern const sal_Char sCalc_Mul[];
+extern const sal_Char sCalc_Div[];
+extern const sal_Char sCalc_Phd[];
+extern const sal_Char sCalc_Sqrt[];
+extern const sal_Char sCalc_Pow[];
+extern const sal_Char sCalc_Or[];
+extern const sal_Char sCalc_Xor[];
+extern const sal_Char sCalc_And[];
+extern const sal_Char sCalc_Not[];
+extern const sal_Char sCalc_Eq[];
+extern const sal_Char sCalc_Neq[];
+extern const sal_Char sCalc_Leq[];
+extern const sal_Char sCalc_Geq[];
+extern const sal_Char sCalc_L[];
+extern const sal_Char sCalc_G[];
+extern const sal_Char sCalc_Sum[];
+extern const sal_Char sCalc_Mean[];
+extern const sal_Char sCalc_Min[];
+extern const sal_Char sCalc_Max[];
+extern const sal_Char sCalc_Sin[];
+extern const sal_Char sCalc_Cos[];
+extern const sal_Char sCalc_Tan[];
+extern const sal_Char sCalc_Asin[];
+extern const sal_Char sCalc_Acos[];
+extern const sal_Char sCalc_Atan[];
+extern const sal_Char sCalc_Tdif[];
+extern const sal_Char sCalc_Round[];
/******************************************************************************
* Calculate ErrorCodes
diff --git a/binfilter/inc/bf_sw/errhdl.hxx b/binfilter/inc/bf_sw/errhdl.hxx
index 484a66f..8a3021d 100644
--- a/binfilter/inc/bf_sw/errhdl.hxx
+++ b/binfilter/inc/bf_sw/errhdl.hxx
@@ -47,8 +47,8 @@ extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box
hochkam
//MSC (7.0) machts nur mit static, ZTC in inlines nur ohne...
#define ASSERT( cond, message ) \
if( !(cond) ) { \
- static const char __FAR_DATA _pErrorText[] = #message; \
- static const char __FAR_DATA _pFileName[] = __FILE__; \
+ static const char _pErrorText[] = #message; \
+ static const char _pFileName[] = __FILE__; \
::binfilter::AssertFail( _pErrorText, _pFileName, __LINE__ ); \
}
#else
@@ -68,7 +68,7 @@ extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box
hochkam
//MSC (7.0) machts nur mit static, ZTC in inlines nur ohne...
#define ASSERT_ID( cond, id ) \
if( !(cond) ) { \
- static const char __FAR_DATA _pFileName[] = __FILE__; \
+ static const char _pFileName[] = __FILE__; \
::binfilter::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \
}
#else
diff --git a/binfilter/inc/bf_sw/fldbas.hxx b/binfilter/inc/bf_sw/fldbas.hxx
index a48566c..8206a6b 100644
--- a/binfilter/inc/bf_sw/fldbas.hxx
+++ b/binfilter/inc/bf_sw/fldbas.hxx
@@ -244,7 +244,7 @@ enum SwDateTimeSubType
#ifndef FIELDIDS_ONLY // SWG-Testreader!!
-extern USHORT __FAR_DATA aTypeTab[];
+extern USHORT aTypeTab[];
/*--------------------------------------------------------------------
Beschreibung: Allgemeine Tools
diff --git a/binfilter/inc/bf_sw/hintids.hxx b/binfilter/inc/bf_sw/hintids.hxx
index 71833ce..cbb1a96 100644
--- a/binfilter/inc/bf_sw/hintids.hxx
+++ b/binfilter/inc/bf_sw/hintids.hxx
@@ -28,7 +28,7 @@
#ifndef _HINTIDS_HXX
#define _HINTIDS_HXX
-#include <tools/solar.h> // fuer __FAR_DATA
+#include <tools/solar.h>
#include <sal/types.h> // for sal_Unicode
@@ -352,8 +352,8 @@ struct SfxItemInfo;
typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ];
-extern SwDfltAttrTab __FAR_DATA aAttrTab;
-extern SfxItemInfo __FAR_DATA aSlotTab[];
+extern SwDfltAttrTab aAttrTab;
+extern SfxItemInfo aSlotTab[];
#ifdef DBG_UTIL
@@ -377,27 +377,27 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
// alle Sets stehen im init.cxx
// AttrSet-Range fuer die 3 Break-Attribute
-extern USHORT __FAR_DATA aBreakSetRange[];
+extern USHORT aBreakSetRange[];
// AttrSet-Range fuer die TxtFmtColl
-extern USHORT __FAR_DATA aTxtFmtCollSetRange[];
+extern USHORT aTxtFmtCollSetRange[];
// AttrSet-Range fuer die GrfFmtColl
-extern USHORT __FAR_DATA aGrfFmtCollSetRange[];
+extern USHORT aGrfFmtCollSetRange[];
// AttrSet-Range fuer die TextNode
-extern USHORT __FAR_DATA aTxtNodeSetRange[];
+extern USHORT aTxtNodeSetRange[];
// AttrSet-Range fuer die NoTxtNode
-extern USHORT __FAR_DATA aNoTxtNodeSetRange[];
+extern USHORT aNoTxtNodeSetRange[];
// AttrSet-Range fuer die SwTable
-extern USHORT __FAR_DATA aTableSetRange[];
+extern USHORT aTableSetRange[];
// AttrSet-Range fuer die SwTableLine
-extern USHORT __FAR_DATA aTableLineSetRange[];
+extern USHORT aTableLineSetRange[];
// AttrSet-Range fuer die SwTableBox
-extern USHORT __FAR_DATA aTableBoxSetRange[];
+extern USHORT aTableBoxSetRange[];
// AttrSet-Range fuer die SwFrmFmt
-extern USHORT __FAR_DATA aFrmFmtSetRange[];
+extern USHORT aFrmFmtSetRange[];
// AttrSet-Range fuer die SwCharFmt
-extern USHORT __FAR_DATA aCharFmtSetRange[];
+extern USHORT aCharFmtSetRange[];
// AttrSet-Range fuer die SwPageDescFmt
-extern USHORT __FAR_DATA aPgFrmFmtSetRange[];
+extern USHORT aPgFrmFmtSetRange[];
// check if ID is InRange of AttrSet-Ids
BOOL IsInRange( const USHORT* pRange, const USHORT nId );
diff --git a/binfilter/inc/bf_sw/iodetect.hxx b/binfilter/inc/bf_sw/iodetect.hxx
index df4a633..8fe61e6 100644
--- a/binfilter/inc/bf_sw/iodetect.hxx
+++ b/binfilter/inc/bf_sw/iodetect.hxx
@@ -124,39 +124,39 @@ const USHORT MAXFILTER =
#define IO_DETECT_IMPL1 \
-sal_Char __FAR_DATA FILTER_SWG[] = "SWG"; \
-sal_Char __FAR_DATA FILTER_SW3[] = "CSW3"; \
-sal_Char __FAR_DATA FILTER_SW4[] = "CSW4"; \
-sal_Char __FAR_DATA FILTER_SW5[] = "CSW5"; \
-sal_Char __FAR_DATA FILTER_BAS[] = "BAS"; \
-sal_Char __FAR_DATA FILTER_RTF[] = "RTF"; \
-sal_Char __FAR_DATA FILTER_W4W[] = "W4W"; \
-sal_Char __FAR_DATA FILTER_SWGV[] = "SWGV"; \
-sal_Char __FAR_DATA FILTER_SW3V[] = "CSW3V"; \
-sal_Char __FAR_DATA FILTER_SW4V[] = "CSW4V"; \
-sal_Char __FAR_DATA FILTER_SW5V[] = "CSW5V"; \
-sal_Char __FAR_DATA FILTER_SWW4V[] = "CSW4VWEB"; \
-sal_Char __FAR_DATA FILTER_SWW5V[] = "CSW5VWEB"; \
-sal_Char __FAR_DATA sSwg1[] = "SWG1"; \
-sal_Char __FAR_DATA sRtfWH[] = "WH_RTF"; \
-sal_Char __FAR_DATA sCExcel[] = "CEXCEL"; \
-sal_Char __FAR_DATA sExcel[] = "EXCEL"; \
-sal_Char __FAR_DATA sLotusD[] = "LOTUSD"; \
-sal_Char __FAR_DATA sLotusW[] = "LOTUSW"; \
-sal_Char __FAR_DATA sHTML[] = "HTML"; \
-sal_Char __FAR_DATA sWW1[] = "WW1"; \
-sal_Char __FAR_DATA sWW5[] = "WW6"; \
-sal_Char __FAR_DATA sWW6[] = "CWW6"; \
-sal_Char __FAR_DATA FILTER_WW8[] = "CWW8"; \
-sal_Char __FAR_DATA FILTER_TEXT_DLG[] = "TEXT_DLG"; \
-sal_Char __FAR_DATA FILTER_TEXT[] = "TEXT"; \
-sal_Char __FAR_DATA sW4W_Int[] = "W4_INT"; \
-sal_Char __FAR_DATA sDebug[] = "DEBUG"; \
-sal_Char __FAR_DATA sUndo[] = "UNDO"; \
-sal_Char __FAR_DATA FILTER_XML[] = "CXML"; \
-sal_Char __FAR_DATA FILTER_XMLV[] = "CXMLV"; \
-sal_Char __FAR_DATA FILTER_XMLVW[] = "CXMLVWEB"; \
-sal_Char __FAR_DATA sSwDos[] = "SW6"; \
+sal_Char FILTER_SWG[] = "SWG"; \
+sal_Char FILTER_SW3[] = "CSW3"; \
+sal_Char FILTER_SW4[] = "CSW4"; \
+sal_Char FILTER_SW5[] = "CSW5"; \
+sal_Char FILTER_BAS[] = "BAS"; \
+sal_Char FILTER_RTF[] = "RTF"; \
+sal_Char FILTER_W4W[] = "W4W"; \
+sal_Char FILTER_SWGV[] = "SWGV"; \
+sal_Char FILTER_SW3V[] = "CSW3V"; \
+sal_Char FILTER_SW4V[] = "CSW4V"; \
+sal_Char FILTER_SW5V[] = "CSW5V"; \
+sal_Char FILTER_SWW4V[] = "CSW4VWEB"; \
+sal_Char FILTER_SWW5V[] = "CSW5VWEB"; \
+sal_Char sSwg1[] = "SWG1"; \
+sal_Char sRtfWH[] = "WH_RTF"; \
+sal_Char sCExcel[] = "CEXCEL"; \
+sal_Char sExcel[] = "EXCEL"; \
+sal_Char sLotusD[] = "LOTUSD"; \
+sal_Char sLotusW[] = "LOTUSW"; \
+sal_Char sHTML[] = "HTML"; \
+sal_Char sWW1[] = "WW1"; \
+sal_Char sWW5[] = "WW6"; \
+sal_Char sWW6[] = "CWW6"; \
+sal_Char FILTER_WW8[] = "CWW8"; \
+sal_Char FILTER_TEXT_DLG[] = "TEXT_DLG"; \
+sal_Char FILTER_TEXT[] = "TEXT"; \
+sal_Char sW4W_Int[] = "W4_INT"; \
+sal_Char sDebug[] = "DEBUG"; \
+sal_Char sUndo[] = "UNDO"; \
+sal_Char FILTER_XML[] = "CXML"; \
+sal_Char FILTER_XMLV[] = "CXMLV"; \
+sal_Char FILTER_XMLVW[] = "CXMLVWEB"; \
+sal_Char sSwDos[] = "SW6"; \
\
\
SwIoDetect aReaderWriter[ MAXFILTER ] = {
\
diff --git a/binfilter/inc/bf_sw/numrule.hxx b/binfilter/inc/bf_sw/numrule.hxx
index 7e46968..10783cf 100644
--- a/binfilter/inc/bf_sw/numrule.hxx
+++ b/binfilter/inc/bf_sw/numrule.hxx
@@ -51,7 +51,7 @@ class SwFmtVertOrient;
class SwNodeNum;
class SwTxtNode;
-extern char __FAR_DATA sOutlineStr[]; // SWG-Filter
+extern char sOutlineStr[]; // SWG-Filter
inline BYTE GetRealLevel( const BYTE nLvl )
{
diff --git a/binfilter/inc/bf_sw/shellio.hxx b/binfilter/inc/bf_sw/shellio.hxx
index 7665fd1..10e003f 100644
--- a/binfilter/inc/bf_sw/shellio.hxx
+++ b/binfilter/inc/bf_sw/shellio.hxx
@@ -567,26 +567,26 @@ public:
// bekannt. Die UI-Seite benutzt die GetReader()/GetWriter() -Funktionen,
// um die speziellen zu erhalten.
-extern sal_Char __FAR_DATA FILTER_SWG[]; // SWG-Filter
-extern sal_Char __FAR_DATA FILTER_RTF[]; // RTF-Filter
-extern sal_Char __FAR_DATA FILTER_TEXT[]; // Text-Filter mit Default-CodeSet
-extern sal_Char __FAR_DATA FILTER_BAS[]; // StarBasic (identisch mit ANSI)
-extern sal_Char __FAR_DATA FILTER_W4W[]; // W4W-Filter
-extern sal_Char __FAR_DATA FILTER_WW8[]; // WinWord 97-Filter
-extern sal_Char __FAR_DATA FILTER_SW3[]; // SW3-Storage Filter
-extern sal_Char __FAR_DATA FILTER_SW4[]; // SW4-Storage Filter
-extern sal_Char __FAR_DATA FILTER_SW4[]; // SW4-Storage Filter
-extern sal_Char __FAR_DATA FILTER_SW5[]; // SW5-Storage Filter
-extern sal_Char __FAR_DATA FILTER_SWGV[]; // SWG-Vorlagen Filter
-extern sal_Char __FAR_DATA FILTER_SW3V[]; // SW3-Storage Vorlagen Filter
-extern sal_Char __FAR_DATA FILTER_SW4V[]; // SW4-Storage Vorlagen Filter
-extern sal_Char __FAR_DATA FILTER_SW5V[]; // SW5-Storage Vorlagen Filter
-extern sal_Char __FAR_DATA FILTER_SWW4V[]; // SW/Web Storage Vorlagen Filter
-extern sal_Char __FAR_DATA FILTER_SWW5V[]; // SW/Web Storage Vorlagen Filter
-extern sal_Char __FAR_DATA FILTER_TEXT_DLG[]; // text filter with encoding dialog
-extern sal_Char __FAR_DATA FILTER_XML[]; // XML filter
-extern sal_Char __FAR_DATA FILTER_XMLV[]; // XML filter
-extern sal_Char __FAR_DATA FILTER_XMLVW[]; // XML filter
+extern sal_Char FILTER_SWG[]; // SWG-Filter
+extern sal_Char FILTER_RTF[]; // RTF-Filter
+extern sal_Char FILTER_TEXT[]; // Text-Filter mit Default-CodeSet
+extern sal_Char FILTER_BAS[]; // StarBasic (identisch mit ANSI)
+extern sal_Char FILTER_W4W[]; // W4W-Filter
+extern sal_Char FILTER_WW8[]; // WinWord 97-Filter
+extern sal_Char FILTER_SW3[]; // SW3-Storage Filter
+extern sal_Char FILTER_SW4[]; // SW4-Storage Filter
+extern sal_Char FILTER_SW4[]; // SW4-Storage Filter
+extern sal_Char FILTER_SW5[]; // SW5-Storage Filter
+extern sal_Char FILTER_SWGV[]; // SWG-Vorlagen Filter
+extern sal_Char FILTER_SW3V[]; // SW3-Storage Vorlagen Filter
+extern sal_Char FILTER_SW4V[]; // SW4-Storage Vorlagen Filter
+extern sal_Char FILTER_SW5V[]; // SW5-Storage Vorlagen Filter
+extern sal_Char FILTER_SWW4V[]; // SW/Web Storage Vorlagen Filter
+extern sal_Char FILTER_SWW5V[]; // SW/Web Storage Vorlagen Filter
+extern sal_Char FILTER_TEXT_DLG[]; // text filter with encoding dialog
+extern sal_Char FILTER_XML[]; // XML filter
+extern sal_Char FILTER_XMLV[]; // XML filter
+extern sal_Char FILTER_XMLVW[]; // XML filter
} //namespace binfilter
diff --git a/binfilter/inc/bf_sw/swtypes.hxx b/binfilter/inc/bf_sw/swtypes.hxx
index 3701bad..49609bc 100644
--- a/binfilter/inc/bf_sw/swtypes.hxx
+++ b/binfilter/inc/bf_sw/swtypes.hxx
@@ -191,13 +191,13 @@ Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev );
// Seperator fuer Sprunge im Dokument auf verschiedene Inhalttype
const sal_Unicode cMarkSeperator = '|';
-extern const sal_Char* __FAR_DATA pMarkToTable; // Strings stehen
-extern const sal_Char* __FAR_DATA pMarkToFrame; // im Init.cxx
-extern const sal_Char* __FAR_DATA pMarkToRegion;
-extern const sal_Char* __FAR_DATA pMarkToOutline;
-extern const sal_Char* __FAR_DATA pMarkToText;
-extern const sal_Char* __FAR_DATA pMarkToGraphic;
-extern const sal_Char* __FAR_DATA pMarkToOLE;
+extern const sal_Char* pMarkToTable; // Strings stehen
+extern const sal_Char* pMarkToFrame; // im Init.cxx
+extern const sal_Char* pMarkToRegion;
+extern const sal_Char* pMarkToOutline;
+extern const sal_Char* pMarkToText;
+extern const sal_Char* pMarkToGraphic;
+extern const sal_Char* pMarkToOLE;
#ifndef DB_DELIM // Ist in OFA definiert!!!
#define DB_DELIM ((sal_Unicode)0xff) // Datenbank <-> Tabellen-Trenner
diff --git a/binfilter/inc/bf_xmloff/xmlkywd.hxx b/binfilter/inc/bf_xmloff/xmlkywd.hxx
index 7ed4342..9c8228d 100644
--- a/binfilter/inc/bf_xmloff/xmlkywd.hxx
+++ b/binfilter/inc/bf_xmloff/xmlkywd.hxx
@@ -47,9 +47,9 @@ namespace binfilter {
*/
#ifndef XML_DEFINE_KEYWORDS
-#define XML_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#define XML_CONSTASCII_ACTION( n, s ) extern sal_Char n[sizeof(s)]
#else
-#define XML_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#define XML_CONSTASCII_ACTION( n, s ) sal_Char n[sizeof(s)] = s
#endif
// common XML
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
old mode 100755
new mode 100644
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
old mode 100755
new mode 100644
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
old mode 100755
new mode 100644
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
old mode 100755
new mode 100644
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 0e20613..4704b1d 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -95,7 +95,7 @@ SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet & rA
USHORT* SdParagraphNumTabPage::GetRanges()
{
- static USHORT __FAR_DATA aRange[] =
+ static USHORT aRange[] =
{
ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END,
0
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 36e5c87..2c21d95 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -33,9 +33,9 @@
#include <tools/solar.h>
#ifndef SD_DEFINE_KEYWORDS
-#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char n[sizeof(s)]
#else
-#define SD_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#define SD_CONSTASCII_ACTION( n, s ) sal_Char n[sizeof(s)] = s
#endif
#define UNO_PREFIX "com.sun.star."
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 11ebe49..33783e2 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -126,7 +126,7 @@ enum WID_PAGE
#endif
#endif
-static sal_Char __FAR_DATA sEmptyPageName[sizeof("page")] = "page";
+static sal_Char sEmptyPageName[sizeof("page")] = "page";
/** this function stores the property maps for draw pages in impress and draw */
const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKind ePageKind )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c74e996..0d50799 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -118,7 +118,7 @@ struct SFX_VB_ErrorItem
SbError nErrorSFX;
};
-const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] =
+const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
{
{ 1, SbERR_BASIC_EXCEPTION }, // #87844 Map exception to error code 1
{ 2, SbERR_SYNTAX },
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
old mode 100755
new mode 100644
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index b7f1162..6838896 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -73,12 +73,12 @@ void GrfWindow::Paint( const Rectangle& )
}
#endif
-static BYTE __FAR_DATA aPal1[ 2 * 4 ] = {
+static BYTE aPal1[ 2 * 4 ] = {
0x00, 0x00, 0x00, 0x00, // Schwarz
0xFF, 0xFF, 0xFF, 0x00 // Weiss
};
-static BYTE __FAR_DATA aPal4[ 16 * 4 ] = {
+static BYTE aPal4[ 16 * 4 ] = {
0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0x00,
0x00, 0x80, 0x00, 0x00,
@@ -97,7 +97,7 @@ static BYTE __FAR_DATA aPal4[ 16 * 4 ] = {
0xFF, 0xFF, 0xFF, 0x00
};
-static BYTE __FAR_DATA aPal8[ 256 * 4 ] =
+static BYTE aPal8[ 256 * 4 ] =
{
0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00,
0x80, 0x92, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x00, 0x80, 0x00, 0xAA, 0x00,
diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx
index 4b2e728..778aa08 100644
--- a/sfx2/inc/sfx2/msg.hxx
+++ b/sfx2/inc/sfx2/msg.hxx
@@ -110,7 +110,7 @@ enum SfxSlotKind
struct SfxTypeAttrib
{
USHORT nAID;
- const char __FAR_DATA* pName;
+ const char* pName;
};
struct SfxType
@@ -223,8 +223,8 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
}
#define SFX_SLOTMAP_NONE(ShellClass) \
- static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[1]; \
- static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] = \
+ static SfxFormalArgument a##ShellClass##Args_Impl[1]; \
+ static SfxSlot a##ShellClass##Slots_Impl[] = \
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
#define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \
@@ -237,7 +237,7 @@ class SfxPoolItem;
struct SfxFormalArgument
{
const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse)
- const char __FAR_DATA* pName; // Name des Parameters
+ const char* pName; // Name des Parameters
USHORT nSlotId;// Slot-Id zur Identifikation des Parameters
const TypeId& Type() const
@@ -263,8 +263,8 @@ public:
SfxStateFunc fnState; // Funktion f"ur Status
const SfxType* pType; // SfxPoolItem-Typ (Status)
- const char __FAR_DATA* pName; // Name des Slots
- const char __FAR_DATA* pMethodName; // Name der Method falls anders
+ const char* pName; // Name des Slots
+ const char* pMethodName; // Name der Method falls anders
const SfxSlot* pLinkedSlot; // Master-Slot f"ur Enum-Werte
const SfxSlot* pNextSlot; // mit derselben
Status-Methode
@@ -273,7 +273,7 @@ public:
USHORT nArgDefCount; // Anzahl der formalen
Argumente
long nDisableFlags; // DisableFlags,
die vorhanden sein
// m"ussen, damit der Slot enabled ist
- const char __FAR_DATA* pUnoName; // UnoName des Slots
+ const char* pUnoName; // UnoName des Slots
public:
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 6d3920a..24bdb80 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -301,12 +301,12 @@ inline void SfxShell::SetPool
//=====================================================================
-#define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[]
=
+#define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[] =
-#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[1]; \
- static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] =
+#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[1]; \
+ static SfxSlot a##ShellClass##Slots_Impl[] =
-#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] =
+#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] =
#define SFX_DECL_INTERFACE(nId)
\
static SfxInterface* pInterface; \
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 4086891..036f284 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -67,7 +67,7 @@ static sal_Char __READONLY_DATA sHTML_SC_auto[] = "AUTO";
static sal_Char __READONLY_DATA sHTML_MIME_text_html[] = "text/html; charset=";
/* not used anymore?
-static HTMLOutEvent __FAR_DATA aFrameSetEventTable[] =
+static HTMLOutEvent aFrameSetEventTable[] =
{
{ sHTML_O_SDonload, sHTML_O_onload, SFX_EVENT_OPENDOC },
{ sHTML_O_SDonunload, sHTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC },
@@ -80,7 +80,7 @@ static HTMLOutEvent __FAR_DATA aFrameSetEventTable[] =
#if defined(UNX)
const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012";
#else
-const sal_Char __FAR_DATA SfxFrameHTMLWriter::sNewLine[] = "\015\012";
+const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012";
#endif
void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 2a409a5..8842888 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -58,9 +58,9 @@
using namespace ::com::sun::star;
-sal_Char __FAR_DATA sHTML_MIME_text[] = "text/";
-sal_Char __FAR_DATA sHTML_MIME_application[] = "application/";
-sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-";
+sal_Char sHTML_MIME_text[] = "text/";
+sal_Char sHTML_MIME_application[] = "application/";
+sal_Char sHTML_MIME_experimental[] = "x-";
// <INPUT TYPE=xxx>
static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] =
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 1cbd60e..1cce2de 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -55,7 +55,7 @@ class XOutdevItemPool;
#define BITMAP_HEIGHT 12
// Standard-Vergleichsstring
-extern sal_Unicode __FAR_DATA pszStandard[]; // "standard"
+extern sal_Unicode pszStandard[]; // "standard"
// Funktion zum Konvertieren in echte RGB-Farben, da mit
// enum COL_NAME nicht verglichen werden kann.
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 7cd13e0..9feadc9 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -35,7 +35,7 @@
#define GLOBALOVERFLOW
// Vergleichsstrings
-sal_Unicode __FAR_DATA pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 };
+sal_Unicode pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 };
// Konvertiert in echte RGB-Farben, damit in den Listboxen
// endlich mal richtig selektiert werden kann.
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index aecdd24..72c5da1 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -278,7 +278,7 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUStrin
} // anonymous namespace
-static __FAR_DATA SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
+static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] =
{
// { XML_LEFT, chart::ChartLegendPosition_LEFT },
// #i35421#
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 0f24d87..52d3646 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -220,7 +220,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap()
{
if( ! mpChartDocElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
+ static SvXMLTokenMapEntry aDocElemTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
@@ -239,7 +239,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap()
{
if( ! mpTableElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
+ static SvXMLTokenMapEntry aTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS },
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS
},
@@ -260,7 +260,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap()
{
if( ! mpChartElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aChartElemTokenMap[] =
+ static SvXMLTokenMapEntry aChartElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_PLOT_AREA,
XML_TOK_CHART_PLOT_AREA },
{ XML_NAMESPACE_CHART, XML_TITLE,
XML_TOK_CHART_TITLE },
@@ -280,7 +280,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
{
if( ! mpPlotAreaElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
+ static SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
{
{ XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT },
{ XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION },
@@ -305,7 +305,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
{
if( ! mpSeriesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSeriesElemTokenMap[] =
+ static SvXMLTokenMapEntry aSeriesElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT },
{ XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN },
@@ -325,7 +325,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAxisElemTokenMap()
{
if( ! mpAxisElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aAxisElemTokenMap[] =
+ static SvXMLTokenMapEntry aAxisElemTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_AXIS_TITLE
},
{ XML_NAMESPACE_CHART, XML_CATEGORIES, XML_TOK_AXIS_CATEGORIES },
@@ -345,7 +345,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
{
if( ! mpChartAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aChartAttrTokenMap[] =
+ static SvXMLTokenMapEntry aChartAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF },
{ XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS
},
@@ -367,7 +367,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
{
if( ! mpPlotAreaAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X },
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y },
@@ -400,7 +400,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAxisAttrTokenMap()
{
if( ! mpAxisAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aAxisAttrTokenMap[] =
+ static SvXMLTokenMapEntry aAxisAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_DIMENSION, XML_TOK_AXIS_DIMENSION
},
{ XML_NAMESPACE_CHART, XML_NAME, XML_TOK_AXIS_NAME
},
@@ -418,7 +418,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetLegendAttrTokenMap()
{
if( ! mpLegendAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aLegendAttrTokenMap[] =
+ static SvXMLTokenMapEntry aLegendAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_LEGEND_POSITION, XML_TOK_LEGEND_POSITION },
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_LEGEND_X
},
@@ -437,7 +437,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap()
{
if( ! mpAutoStyleAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] =
+ static SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_FAMILY, XML_TOK_AS_FAMILY
},
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_AS_NAME
},
@@ -454,7 +454,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
{
if( ! mpCellAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aCellAttrTokenMap[] =
+ static SvXMLTokenMapEntry aCellAttrTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE
},
{ XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE
},
@@ -471,7 +471,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap()
{
if( ! mpSeriesAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
+ static SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE },
{ XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS },
@@ -491,7 +491,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
{
if( ! mpRegEquationAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
+ static SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
{
{ XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME },
{ XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION },
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index b53dbe6..ae3f3ce 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -85,7 +85,7 @@ using namespace ::xmloff::token;
using ::rtl::OUString;
using com::sun::star::uno::Reference;
-static __FAR_DATA SvXMLEnumMapEntry aXMLAxisClassMap[] =
+static SvXMLEnumMapEntry aXMLAxisClassMap[] =
{
{ XML_X, SCH_XML_AXIS_X },
{ XML_Y, SCH_XML_AXIS_Y },
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 6c3adad..b07fecb 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -40,7 +40,6 @@
#include <xmloff/xmluconv.hxx>
// header for struct SvXMLEnumMapEntry
#include <xmloff/xmlement.hxx>
-// header for define __FAR_DATA
#include <tools/solar.h>
// header for class SvXMLImportPropertyMapper
@@ -164,7 +163,7 @@ Reference< chart2::data::XDataSequence > lcl_createNewSequenceFromCachedXMLRange
namespace SchXMLTools
{
-static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] =
+static SvXMLEnumMapEntry aXMLChartClassMap[] =
{
{ XML_LINE, XML_CHART_CLASS_LINE },
{ XML_AREA, XML_CHART_CLASS_AREA },
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx
b/xmloff/source/chart/XMLSymbolImageContext.cxx
index d2aa358..4a14dcc 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -50,7 +50,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_SYMBOL_IMAGE_END = XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
+static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF },
{ XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE },
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index bb24469..28240ad 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -88,7 +88,7 @@ enum XMLImageMapToken
XML_TOK_IMAP_TARGET
};
-static __FAR_DATA SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
+static SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL
},
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME
},
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index bd42648..10258fc 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -166,7 +166,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap()
{
if( mpAnimationNodeTokenMap == NULL )
{
- static __FAR_DATA SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
+ static SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
{
{ XML_NAMESPACE_ANIMATION, XML_PAR,
(sal_uInt16)AnimationNodeType::PAR },
{ XML_NAMESPACE_ANIMATION, XML_SEQ,
(sal_uInt16)AnimationNodeType::SEQ },
@@ -245,7 +245,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM
{
if( mpAnimationNodeAttributeTokenMap == NULL )
{
- static __FAR_DATA SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
+ static SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
{
{ XML_NAMESPACE_SMIL, XML_BEGIN,
(sal_uInt16)ANA_Begin },
{ XML_NAMESPACE_SMIL, XML_DUR,
(sal_uInt16)ANA_Dur },
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index b016b5e..6b91345 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -502,7 +502,7 @@ const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap()
{
if(!mpDocElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] =
+ static SvXMLTokenMapEntry aDocElemTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES
},
@@ -527,7 +527,7 @@ const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap()
{
if(!mpBodyElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aBodyElemTokenMap[] =
+ static SvXMLTokenMapEntry aBodyElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_PAGE, XML_TOK_BODY_PAGE },
{ XML_NAMESPACE_PRESENTATION, XML_SETTINGS, XML_TOK_BODY_SETTINGS },
@@ -550,7 +550,7 @@ const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap()
{
if(!mpStylesElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aStylesElemTokenMap[] =
+ static SvXMLTokenMapEntry aStylesElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT,
XML_TOK_STYLES_PAGE_MASTER },
{ XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT,
XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT },
@@ -570,7 +570,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap()
{
if(!mpMasterPageElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
+ static SvXMLTokenMapEntry aMasterPageElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_MASTERPAGE_STYLE
},
{ XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_MASTERPAGE_NOTES },
@@ -589,7 +589,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap()
{
if(!mpMasterPageAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
+ static SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_NAME,
XML_TOK_MASTERPAGE_NAME },
{ XML_NAMESPACE_STYLE, XML_DISPLAY_NAME,
XML_TOK_MASTERPAGE_DISPLAY_NAME },
@@ -614,7 +614,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
{
if(!mpPageMasterAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_NAME,
XML_TOK_PAGEMASTER_NAME },
XML_TOKEN_MAP_END
@@ -632,7 +632,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
{
if(!mpPageMasterStyleAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_FO, XML_MARGIN_TOP,
XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP },
{ XML_NAMESPACE_FO, XML_MARGIN_BOTTOM,
XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM },
@@ -656,7 +656,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap()
{
if(!mpDrawPageAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
+ static SvXMLTokenMapEntry aDrawPageAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME,
XML_TOK_DRAWPAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME,
XML_TOK_DRAWPAGE_STYLE_NAME },
@@ -684,7 +684,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
{
if(!mpDrawPageElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
+ static SvXMLTokenMapEntry aDrawPageElemTokenMap[] =
{
{ XML_NAMESPACE_PRESENTATION, XML_NOTES,
XML_TOK_DRAWPAGE_NOTES },
{ XML_NAMESPACE_ANIMATION, XML_PAR,
XML_TOK_DRAWPAGE_PAR },
@@ -704,7 +704,7 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
{
if(!mpPresentationPlaceholderAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] =
{
{ XML_NAMESPACE_PRESENTATION, XML_OBJECT, XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME
},
{ XML_NAMESPACE_SVG, XML_X,
XML_TOK_PRESENTATIONPLACEHOLDER_X },
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 5b38bcf..1c960bd 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -275,7 +275,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
{
if(!mpGroupShapeElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
+ static SvXMLTokenMapEntry aGroupShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_G, XML_TOK_GROUP_GROUP
},
{ XML_NAMESPACE_DRAW, XML_RECT, XML_TOK_GROUP_RECT
},
@@ -315,7 +315,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap()
{
if(!mpFrameShapeElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
+ static SvXMLTokenMapEntry aFrameShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_TEXT_BOX, XML_TOK_FRAME_TEXT_BOX
},
{ XML_NAMESPACE_DRAW, XML_IMAGE, XML_TOK_FRAME_IMAGE
},
@@ -341,7 +341,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
{
if(!mp3DSceneShapeElemTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
+ static SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_3DSCENE_3DSCENE
},
{ XML_NAMESPACE_DR3D, XML_CUBE, XML_TOK_3DSCENE_3DCUBE
},
@@ -364,7 +364,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap()
{
if(!mpShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME,
XML_TOK_SHAPE_NAME },
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME,
XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS },
@@ -389,7 +389,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
{
if(!mp3DObjectAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME,
XML_TOK_3DOBJECT_DRAWSTYLE_NAME },
{ XML_NAMESPACE_DR3D, XML_TRANSFORM,
XML_TOK_3DOBJECT_TRANSFORM },
@@ -409,7 +409,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
{
if(!mp3DPolygonBasedAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX,
XML_TOK_3DPOLYGONBASED_VIEWBOX },
{ XML_NAMESPACE_SVG, XML_D,
XML_TOK_3DPOLYGONBASED_D },
@@ -429,7 +429,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
{
if(!mp3DCubeObjectAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_MIN_EDGE,
XML_TOK_3DCUBEOBJ_MINEDGE },
{ XML_NAMESPACE_DR3D, XML_MAX_EDGE,
XML_TOK_3DCUBEOBJ_MAXEDGE },
@@ -449,7 +449,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
{
if(!mp3DSphereObjectAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_CENTER,
XML_TOK_3DSPHEREOBJ_CENTER },
{ XML_NAMESPACE_DR3D, XML_SIZE,
XML_TOK_3DSPHEREOBJ_SIZE },
@@ -469,7 +469,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetRectShapeAttrTokenMap()
{
if(!mpRectShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aRectShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aRectShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_RECTSHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_RECTSHAPE_Y
},
@@ -492,7 +492,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetLineShapeAttrTokenMap()
{
if(!mpLineShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aLineShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aLineShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X1, XML_TOK_LINESHAPE_X1
},
{ XML_NAMESPACE_SVG, XML_Y1, XML_TOK_LINESHAPE_Y1
},
@@ -514,7 +514,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetEllipseShapeAttrTokenMap()
{
if(!mpEllipseShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_RX, XML_TOK_ELLIPSESHAPE_RX
},
{ XML_NAMESPACE_SVG, XML_RY, XML_TOK_ELLIPSESHAPE_RY
},
@@ -537,7 +537,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap()
{
if(!mpPolygonShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_POLYGONSHAPE_VIEWBOX
},
{ XML_NAMESPACE_DRAW, XML_POINTS, XML_TOK_POLYGONSHAPE_POINTS
},
@@ -557,7 +557,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap()
{
if(!mpPathShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPathShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPathShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_PATHSHAPE_VIEWBOX
},
{ XML_NAMESPACE_SVG, XML_D, XML_TOK_PATHSHAPE_D
},
@@ -577,7 +577,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetTextBoxShapeAttrTokenMap()
{
if(!mpTextBoxShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_TEXTBOXSHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_TEXTBOXSHAPE_Y
},
@@ -599,7 +599,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetControlShapeAttrTokenMap()
{
if(!mpControlShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aControlShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aControlShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_CONTROLSHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_CONTROLSHAPE_Y
},
@@ -621,7 +621,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap()
{
if(!mp3DSceneShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DSCENESHAPE_TRANSFORM
},
{ XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_3DSCENESHAPE_VRP
},
@@ -650,7 +650,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
{
if(!mp3DLightAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
+ static SvXMLTokenMapEntry a3DLightAttrTokenMap[] =
{
{ XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TOK_3DLIGHT_DIFFUSE_COLOR
},
{ XML_NAMESPACE_DR3D, XML_DIRECTION, XML_TOK_3DLIGHT_DIRECTION
},
@@ -672,7 +672,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap()
{
if(!mpPageShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aPageShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_PAGESHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_PAGESHAPE_Y
},
@@ -694,7 +694,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap()
{
if(!mpGraphicObjectShapeAttrTokenMap)
{
- static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
+ static SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_GOSHAPE_X
},
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_GOSHAPE_Y
},
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index be7ed27..e58a12e 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -52,7 +52,7 @@ using ::rtl::OUString;
// ------------------------------------------------------------------------
-sal_Char __FAR_DATA XMLN_VERSIONSLIST[] = "VersionList.xml";
+sal_Char XMLN_VERSIONSLIST[] = "VersionList.xml";
// ------------------------------------------------------------------------
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 2075a0d..23be48c 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_DASH_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aDashStyleAttrTokenMap[] =
+static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME },
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 47c06be..fc752bc 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -112,7 +112,7 @@ sal_Bool XMLGradientStyleImport::importXML(
aGradient.Border = 0;
{
- static __FAR_DATA SvXMLTokenMapEntry aGradientAttrTokenMap[] =
+ static SvXMLTokenMapEntry aGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index c3ec279..f1d3db0 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -101,7 +101,7 @@ sal_Bool XMLHatchStyleImport::importXML(
aHatch.Angle = 0;
{
- static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+ static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_HATCH_DISPLAY_NAME },
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 69e4a04..3b78ea7 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -152,7 +152,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
OUString aDisplayName;
{
- static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] =
+ static SvXMLTokenMapEntry aHatchAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME },
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 05b77a4..cfa15cd 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -107,7 +107,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
aGradient.Border = 0;
{
- static __FAR_DATA SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
+ static SvXMLTokenMapEntry aTrGradientAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME },
{ XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME },
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx
b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 06fe2ea..0820ce1 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs
};
const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
+ static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx
b/xmloff/source/style/XMLFontStylesContext.cxx
index ccf9705..9583e1c 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -71,7 +71,7 @@ enum XMLFontStyleAttrTokens
const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
+ static SvXMLTokenMapEntry aFontStyleAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_FONT_FAMILY,
XML_TOK_FONT_STYLE_ATTR_FAMILY },
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5522848..a5e1226 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -334,14 +334,14 @@ static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
// maps for SvXMLUnitConverter::convertEnum
-static __FAR_DATA SvXMLEnumMapEntry aStyleValueMap[] =
+static SvXMLEnumMapEntry aStyleValueMap[] =
{
{ XML_SHORT, sal_False },
{ XML_LONG, sal_True },
{ XML_TOKEN_INVALID, 0 }
};
-static __FAR_DATA SvXMLEnumMapEntry aFormatSourceMap[] =
+static SvXMLEnumMapEntry aFormatSourceMap[] =
{
{ XML_FIXED, sal_False },
{ XML_LANGUAGE, sal_True },
@@ -363,7 +363,7 @@ struct SvXMLDefaultDateFormat
sal_Bool bSystem;
};
-static __FAR_DATA SvXMLDefaultDateFormat aDefaultDateFormats[] =
+static SvXMLDefaultDateFormat aDefaultDateFormats[] =
{
// format day-of-week day
month year hours
minutes seconds format-source
@@ -504,7 +504,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStylesElemTokenMap()
{
if( !pStylesElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aStylesElemMap[] =
+ static SvXMLTokenMapEntry aStylesElemMap[] =
{
// style elements
{ XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE, XML_TOK_STYLES_NUMBER_STYLE },
@@ -526,7 +526,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap()
{
if( !pStyleElemTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aStyleElemMap[] =
+ static SvXMLTokenMapEntry aStyleElemMap[] =
{
// elements in a style
{ XML_NAMESPACE_NUMBER, XML_TEXT, XML_TOK_STYLE_TEXT
},
@@ -561,7 +561,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleAttrTokenMap()
{
if( !pStyleAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aStyleAttrMap[] =
+ static SvXMLTokenMapEntry aStyleAttrMap[] =
{
// attributes for a style
{ XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_STYLE_ATTR_NAME
},
@@ -588,7 +588,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap()
{
if( !pStyleElemAttrTokenMap )
{
- static __FAR_DATA SvXMLTokenMapEntry aStyleElemAttrMap[] =
+ static SvXMLTokenMapEntry aStyleElemAttrMap[] =
{
// attributes for an element within a style
{ XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES,
XML_TOK_ELEM_ATTR_DECIMAL_PLACES },
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index f7e9b39..fcf90b9 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -175,7 +175,7 @@ enum SvxXMLTextListLevelStyleAttrTokens
const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aLevelAttrTokenMap[] =
+ static SvXMLTokenMapEntry aLevelAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_LEVEL_ATTR_LEVEL },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME },
@@ -679,7 +679,7 @@ enum SvxXMLStyleAttributesAttrTokens
};
const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
+ static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_SPACE_BEFORE,
XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE },
@@ -1001,7 +1001,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens
};
const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
+ static SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LABEL_FOLLOWED_BY,
XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY },
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 762270e..910e7d7 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -77,7 +77,7 @@ using namespace ::xmloff::token;
// ---------------------------------------------------------------------
-static __FAR_DATA SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
+static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE
},
{ XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER },
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index a642388..8027537 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] =
+static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION },
{ XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE },
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 08e61c8..a5a7999 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -196,7 +196,7 @@ enum XMLFtnConfigToken
XML_TOK_FTNCONFIG_POSITION
};
-static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, XML_TOK_FTNCONFIG_CITATION_STYLENAME },
{ XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME },
diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx
b/xmloff/source/text/XMLFootnoteImportContext.cxx
index 92c8b19..12b43d2 100644
--- a/xmloff/source/text/XMLFootnoteImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteImportContext.cxx
@@ -71,7 +71,7 @@ enum XMLFootnoteChildToken {
XML_TOK_FTN_NOTE_BODY
};
-static __FAR_DATA SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
+static SvXMLTokenMapEntry aFootnoteChildTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_NOTE_CITATION,
XML_TOK_FTN_NOTE_CITATION },
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index 0d45113..a1b4b67 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -59,7 +59,7 @@ using ::com::sun::star::xml::sax::XAttributeList;
const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter";
const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops";
-static __FAR_DATA SvXMLTokenMapEntry aIndexSourceTokenMap[] =
+static SvXMLTokenMapEntry aIndexSourceTokenMap[] =
{
{ XML_NAMESPACE_TEXT,
XML_OUTLINE_LEVEL,
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx
b/xmloff/source/text/XMLSectionImportContext.cxx
index 44a9a57..bd957e5 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -81,7 +81,7 @@ enum XMLSectionToken
XML_TOK_SECTION_IS_HIDDEN
};
-static __FAR_DATA SvXMLTokenMapEntry aSectionTokenMap[] =
+static SvXMLTokenMapEntry aSectionTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_SECTION_XMLID },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME },
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index 955c2dd..1e60644 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -87,7 +87,7 @@ enum XMLSectionSourceDDEToken
XML_TOK_SECTION_IS_AUTOMATIC_UPDATE
};
-static __FAR_DATA SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
+static SvXMLTokenMapEntry aSectionSourceDDETokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
XML_TOK_SECTION_DDE_APPLICATION },
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx
b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index ceb7f65..a8737cd 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -74,7 +74,7 @@ enum XMLSectionSourceToken
XML_TOK_SECTION_TEXT_SECTION_NAME
};
-static __FAR_DATA SvXMLTokenMapEntry aSectionSourceTokenMap[] =
+static SvXMLTokenMapEntry aSectionSourceTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF },
{ XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME },
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx
b/xmloff/source/text/XMLTextColumnsContext.cxx
index 59c7bd8..10e620a 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -71,7 +71,7 @@ enum SvXMLSepTokenMapAttrs
XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] =
+static SvXMLTokenMapEntry aColAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH },
{ XML_NAMESPACE_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT },
@@ -79,7 +79,7 @@ static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aColSepAttrTokenMap[] =
+static SvXMLTokenMapEntry aColSepAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH },
{ XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR },
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 51c5f94..5b5d852 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -55,7 +55,7 @@ enum SvXMLTokenMapDropAttrs
XML_TOK_DROP_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aDropAttrTokenMap[] =
+static SvXMLTokenMapEntry aDropAttrTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_LINES, XML_TOK_DROP_LINES },
{ XML_NAMESPACE_STYLE, XML_LENGTH, XML_TOK_DROP_LENGTH },
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index dc40a89..4131688 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3009,7 +3009,7 @@ enum DdeFieldDeclAttrs
XML_TOK_DDEFIELD_UPDATE
};
-static __FAR_DATA SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
+static SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME },
{ XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION },
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index a121d8b..45541cd 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -121,7 +121,7 @@ using ::comphelper::UStringLess;
-static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] =
+static SvXMLTokenMapEntry aTextElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_P, XML_TOK_TEXT_P
},
{ XML_NAMESPACE_TEXT, XML_H, XML_TOK_TEXT_H
},
@@ -157,7 +157,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
+static SvXMLTokenMapEntry aTextPElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN },
{ XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP },
@@ -333,7 +333,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextPAttrTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID },
{ XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT },
@@ -351,7 +351,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID },
{ XML_NAMESPACE_TEXT, XML_LIST_ID,
@@ -366,7 +366,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
{
{ XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID },
{ XML_NAMESPACE_TEXT, XML_STYLE_NAME,
@@ -378,14 +378,14 @@ static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
+static SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER },
{ XML_NAMESPACE_TEXT, XML_LIST_ITEM, XML_TOK_TEXT_LIST_ITEM },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
{
{ XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME },
{ XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME },
@@ -417,7 +417,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
{
{ XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH },
{ XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT },
@@ -428,7 +428,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF },
{ XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME },
@@ -440,7 +440,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
+static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER },
{ XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER },
@@ -450,7 +450,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
+static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{
{ XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
{ XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION },
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 2ba64b3..53eeb92 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::container;
//using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-static __FAR_DATA SvXMLEnumMapEntry aCategoryMap[] =
+static SvXMLEnumMapEntry aCategoryMap[] =
{
{ XML_TEXT, ParagraphStyleCategory::TEXT },
{ XML_CHAPTER, ParagraphStyleCategory::CHAPTER },
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f4e7939..ee7d917 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -87,7 +87,7 @@ using namespace ::com::sun::star::lang;
#define UNKNOWN_SUBSTITUTE LANGUAGE_ENGLISH_US
static BOOL bIndexTableInitialized = FALSE;
-static sal_uInt32 __FAR_DATA theIndexTable[NF_INDEX_TABLE_ENTRIES];
+static sal_uInt32 theIndexTable[NF_INDEX_TABLE_ENTRIES];
// ====================================================================
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx
index 7b3ad55..4b5c117 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
@@ -43,7 +43,7 @@ public:
#if defined(MAC) || defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index c73f307..df9054a 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.hxx
@@ -64,7 +64,7 @@ struct HTMLOutFuncs
#if defined(MAC) || defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
SVT_DLLPUBLIC static void ConvertStringToHTML( const String& sSrc, ByteString& rDest,
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index bf74abb..079721d 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::util;
// regular expression to validate complete numbers, plus every fragment which can occur during the
input
// of a complete number
// [+/-][{digit}*.]*{digit}*[,{digit}*][e[+/-]{digit}*]
-const char __FAR_DATA szNumericInput[] = "_[-+]?([0-9]*\\,)*[0-9]*(\\.[0-9]*)?(e[-+]?[0-9]*)?_";
+const char szNumericInput[] = "_[-+]?([0-9]*\\,)*[0-9]*(\\.[0-9]*)?(e[-+]?[0-9]*)?_";
// (the two _ are for normalizing it: With this, we can ensure that a to-be-checked text is
always
// matched as a _whole_)
#else
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index ad13739..d5bd4b9 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -50,9 +50,9 @@ struct HTML_TokenEntry
};
// Flag: RTF-Token Tabelle wurde schon sortiert
-static int __FAR_DATA bSortKeyWords = FALSE;
+static int bSortKeyWords = FALSE;
-static HTML_TokenEntry __FAR_DATA aHTMLTokenTab[] = {
+static HTML_TokenEntry aHTMLTokenTab[] = {
{{OOO_STRING_SVTOOLS_HTML_area}, HTML_AREA}, // Netscape 2.0
{{OOO_STRING_SVTOOLS_HTML_base}, HTML_BASE}, // HTML 3.0
{{OOO_STRING_SVTOOLS_HTML_comment}, HTML_COMMENT},
@@ -280,9 +280,9 @@ struct HTML_CharEntry
};
// Flag: RTF-Token Tabelle wurde schon sortiert
-static int __FAR_DATA bSortCharKeyWords = FALSE;
+static int bSortCharKeyWords = FALSE;
-static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = {
+static HTML_CharEntry aHTMLCharNameTab[] = {
{{OOO_STRING_SVTOOLS_HTML_C_lt}, 60},
{{OOO_STRING_SVTOOLS_HTML_C_gt}, 62},
{{OOO_STRING_SVTOOLS_HTML_C_amp}, 38},
@@ -621,9 +621,9 @@ sal_Unicode GetHTMLCharName( const String& rName )
/* */
// Flag: Optionen-Tabelle wurde schon sortiert
-static int __FAR_DATA bSortOptionKeyWords = FALSE;
+static int bSortOptionKeyWords = FALSE;
-static HTML_TokenEntry __FAR_DATA aHTMLOptionTab[] = {
+static HTML_TokenEntry aHTMLOptionTab[] = {
// Attribute ohne Wert
{{OOO_STRING_SVTOOLS_HTML_O_box}, HTML_O_BOX},
@@ -864,7 +864,7 @@ struct HTML_ColorEntry
ULONG nColor;
};
-static int __FAR_DATA bSortColorKeyWords = FALSE;
+static int bSortColorKeyWords = FALSE;
#define HTML_NO_COLOR 0xffffffffUL
@@ -873,7 +873,7 @@ static int __FAR_DATA bSortColorKeyWords = FALSE;
// und scheinen im Gegensatz zu denen aus
// "http://www.infi.net/wwwimages/colorindex.html";
// zu stimmen
-static HTML_ColorEntry __FAR_DATA aHTMLColorNameTab[] = {
+static HTML_ColorEntry aHTMLColorNameTab[] = {
{ { "ALICEBLUE" }, 0x00f0f8ffUL },
{ { "ANTIQUEWHITE" }, 0x00faebd7UL },
{ { "AQUA" }, 0x0000ffffUL },
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index e8bb833..00c7627 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -51,7 +51,7 @@
#if defined(UNX)
const sal_Char HTMLOutFuncs::sNewLine = '\012';
#else
-const sal_Char __FAR_DATA HTMLOutFuncs::sNewLine[] = "\015\012";
+const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012";
#endif
#define TXTCONV_BUFFER_SIZE 20
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 9f78fb9..611a5e0 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -48,9 +48,9 @@ struct RTF_TokenEntry
};
// Flag: RTF-Token Tabelle wurde schon sortiert
-static int __FAR_DATA bSortKeyWords = FALSE;
+static int bSortKeyWords = FALSE;
-static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
+static RTF_TokenEntry aRTFTokenTab[] = {
{{OOO_STRING_SVTOOLS_RTF_IGNORE}, RTF_IGNOREFLAG},
{{OOO_STRING_SVTOOLS_RTF_RTF}, RTF_RTF},
{{OOO_STRING_SVTOOLS_RTF_ANSI}, RTF_ANSITYPE},
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 2bb4be1..25c4de1 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -41,7 +41,7 @@ using namespace rtl;
#if defined(UNX)
const sal_Char RTFOutFuncs::sNewLine = '\012';
#else
-const sal_Char __FAR_DATA RTFOutFuncs::sNewLine[] = "\015\012";
+const sal_Char RTFOutFuncs::sNewLine[] = "\015\012";
#endif
diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx
b/toolkit/inc/toolkit/helper/servicenames.hxx
index cdfdb8a..32860f3 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/toolkit/inc/toolkit/helper/servicenames.hxx
@@ -32,84 +32,84 @@
#include <sal/types.h>
#include <tools/solar.h>
-extern const sal_Char __FAR_DATA szServiceName_Toolkit[], szServiceName2_Toolkit[];
-extern const sal_Char __FAR_DATA szServiceName_MVCIntrospection[],
szServiceName2_MVCIntrospection[];
-extern const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
-extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
-extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[],
szServiceName2_UnoControlContainer[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[],
szServiceName2_UnoControlContainerModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[],
szServiceName2_UnoMultiPageControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[],
szServiceName2_UnoMultiPageModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoPageControl[], szServiceName2_UnoPageControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoPageModel[], szServiceName2_UnoPageModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoFrameControl[], szServiceName2_UnoFrameControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoFrameModel[], szServiceName2_UnoFrameModel[];
-extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
-extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[],
szServiceName2_TabControllerModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlDialog[],
szServiceName2_UnoControlDialog[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlDialogModel[],
szServiceName2_UnoControlDialogModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlEditModel[],
szServiceName2_UnoControlEditModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFileControl[],
szServiceName2_UnoControlFileControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFileControlModel[],
szServiceName2_UnoControlFileControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlButton[],
szServiceName2_UnoControlButton[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlButtonModel[],
szServiceName2_UnoControlButtonModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageButton[],
szServiceName2_UnoControlImageButton[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageButtonModel[],
szServiceName2_UnoControlImageButtonModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageControl[],
szServiceName2_UnoControlImageControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageControlModel[],
szServiceName2_UnoControlImageControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlRadioButton[],
szServiceName2_UnoControlRadioButton[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlRadioButtonModel[],
szServiceName2_UnoControlRadioButtonModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlCheckBox[],
szServiceName2_UnoControlCheckBox[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlCheckBoxModel[],
szServiceName2_UnoControlCheckBoxModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlListBox[],
szServiceName2_UnoControlListBox[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlListBoxModel[],
szServiceName2_UnoControlListBoxModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlComboBox[],
szServiceName2_UnoControlComboBox[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlComboBoxModel[],
szServiceName2_UnoControlComboBoxModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedText[],
szServiceName2_UnoControlFixedText[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedTextModel[],
szServiceName2_UnoControlFixedTextModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlGroupBox[],
szServiceName2_UnoControlGroupBox[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlGroupBoxModel[],
szServiceName2_UnoControlGroupBoxModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlDateField[],
szServiceName2_UnoControlDateField[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlDateFieldModel[],
szServiceName2_UnoControlDateFieldModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlTimeField[],
szServiceName2_UnoControlTimeField[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlTimeFieldModel[],
szServiceName2_UnoControlTimeFieldModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlNumericField[],
szServiceName2_UnoControlNumericField[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlNumericFieldModel[],
szServiceName2_UnoControlNumericFieldModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyField[],
szServiceName2_UnoControlCurrencyField[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyFieldModel[],
szServiceName2_UnoControlCurrencyFieldModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlPatternField[],
szServiceName2_UnoControlPatternField[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[],
szServiceName2_UnoControlPatternFieldModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[],
szServiceName2_UnoControlFormattedField[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[],
szServiceName2_UnoControlFormattedFieldModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[],
szServiceName2_UnoControlProgressBar[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[],
szServiceName2_UnoControlProgressBarModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlScrollBar[],
szServiceName2_UnoControlScrollBar[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlScrollBarModel[],
szServiceName2_UnoControlScrollBarModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedLine[],
szServiceName2_UnoControlFixedLine[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedLineModel[],
szServiceName2_UnoControlFixedLineModel[];
-extern const sal_Char __FAR_DATA szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[],
szServiceName2_UnoControlRoadmap[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[],
szServiceName2_UnoControlRoadmapModel[];
+extern const sal_Char szServiceName_Toolkit[], szServiceName2_Toolkit[];
+extern const sal_Char szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[];
+extern const sal_Char szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
+extern const sal_Char szServiceName_MenuBar[], szServiceName2_MenuBar[];
+extern const sal_Char szServiceName_Pointer[], szServiceName2_Pointer[];
+extern const sal_Char szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
+extern const sal_Char szServiceName_UnoControlContainerModel[],
szServiceName2_UnoControlContainerModel[];
+extern const sal_Char szServiceName_UnoMultiPageControl[], szServiceName2_UnoMultiPageControl[];
+extern const sal_Char szServiceName_UnoMultiPageModel[], szServiceName2_UnoMultiPageModel[];
+extern const sal_Char szServiceName_UnoPageControl[], szServiceName2_UnoPageControl[];
+extern const sal_Char szServiceName_UnoPageModel[], szServiceName2_UnoPageModel[];
+extern const sal_Char szServiceName_UnoFrameControl[], szServiceName2_UnoFrameControl[];
+extern const sal_Char szServiceName_UnoFrameModel[], szServiceName2_UnoFrameModel[];
+extern const sal_Char szServiceName_TabController[], szServiceName2_TabController[];
+extern const sal_Char szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
+extern const sal_Char szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
+extern const sal_Char szServiceName_UnoControlDialogModel[],
szServiceName2_UnoControlDialogModel[];
+extern const sal_Char szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
+extern const sal_Char szServiceName_UnoControlEditModel[], szServiceName2_UnoControlEditModel[];
+extern const sal_Char szServiceName_UnoControlFileControl[],
szServiceName2_UnoControlFileControl[];
+extern const sal_Char szServiceName_UnoControlFileControlModel[],
szServiceName2_UnoControlFileControlModel[];
+extern const sal_Char szServiceName_UnoControlButton[], szServiceName2_UnoControlButton[];
+extern const sal_Char szServiceName_UnoControlButtonModel[],
szServiceName2_UnoControlButtonModel[];
+extern const sal_Char szServiceName_UnoControlImageButton[],
szServiceName2_UnoControlImageButton[];
+extern const sal_Char szServiceName_UnoControlImageButtonModel[],
szServiceName2_UnoControlImageButtonModel[];
+extern const sal_Char szServiceName_UnoControlImageControl[],
szServiceName2_UnoControlImageControl[];
+extern const sal_Char szServiceName_UnoControlImageControlModel[],
szServiceName2_UnoControlImageControlModel[];
+extern const sal_Char szServiceName_UnoControlRadioButton[],
szServiceName2_UnoControlRadioButton[];
+extern const sal_Char szServiceName_UnoControlRadioButtonModel[],
szServiceName2_UnoControlRadioButtonModel[];
+extern const sal_Char szServiceName_UnoControlCheckBox[], szServiceName2_UnoControlCheckBox[];
+extern const sal_Char szServiceName_UnoControlCheckBoxModel[],
szServiceName2_UnoControlCheckBoxModel[];
+extern const sal_Char szServiceName_UnoControlListBox[], szServiceName2_UnoControlListBox[];
+extern const sal_Char szServiceName_UnoControlListBoxModel[],
szServiceName2_UnoControlListBoxModel[];
+extern const sal_Char szServiceName_UnoControlComboBox[], szServiceName2_UnoControlComboBox[];
+extern const sal_Char szServiceName_UnoControlComboBoxModel[],
szServiceName2_UnoControlComboBoxModel[];
+extern const sal_Char szServiceName_UnoControlFixedText[], szServiceName2_UnoControlFixedText[];
+extern const sal_Char szServiceName_UnoControlFixedTextModel[],
szServiceName2_UnoControlFixedTextModel[];
+extern const sal_Char szServiceName_UnoControlGroupBox[], szServiceName2_UnoControlGroupBox[];
+extern const sal_Char szServiceName_UnoControlGroupBoxModel[],
szServiceName2_UnoControlGroupBoxModel[];
+extern const sal_Char szServiceName_UnoControlDateField[], szServiceName2_UnoControlDateField[];
+extern const sal_Char szServiceName_UnoControlDateFieldModel[],
szServiceName2_UnoControlDateFieldModel[];
+extern const sal_Char szServiceName_UnoControlTimeField[], szServiceName2_UnoControlTimeField[];
+extern const sal_Char szServiceName_UnoControlTimeFieldModel[],
szServiceName2_UnoControlTimeFieldModel[];
+extern const sal_Char szServiceName_UnoControlNumericField[],
szServiceName2_UnoControlNumericField[];
+extern const sal_Char szServiceName_UnoControlNumericFieldModel[],
szServiceName2_UnoControlNumericFieldModel[];
+extern const sal_Char szServiceName_UnoControlCurrencyField[],
szServiceName2_UnoControlCurrencyField[];
+extern const sal_Char szServiceName_UnoControlCurrencyFieldModel[],
szServiceName2_UnoControlCurrencyFieldModel[];
+extern const sal_Char szServiceName_UnoControlPatternField[],
szServiceName2_UnoControlPatternField[];
+extern const sal_Char szServiceName_UnoControlPatternFieldModel[],
szServiceName2_UnoControlPatternFieldModel[];
+extern const sal_Char szServiceName_UnoControlFormattedField[],
szServiceName2_UnoControlFormattedField[];
+extern const sal_Char szServiceName_UnoControlFormattedFieldModel[],
szServiceName2_UnoControlFormattedFieldModel[];
+extern const sal_Char szServiceName_UnoControlProgressBar[],
szServiceName2_UnoControlProgressBar[];
+extern const sal_Char szServiceName_UnoControlProgressBarModel[],
szServiceName2_UnoControlProgressBarModel[];
+extern const sal_Char szServiceName_UnoControlScrollBar[], szServiceName2_UnoControlScrollBar[];
+extern const sal_Char szServiceName_UnoControlScrollBarModel[],
szServiceName2_UnoControlScrollBarModel[];
+extern const sal_Char szServiceName_UnoControlFixedLine[], szServiceName2_UnoControlFixedLine[];
+extern const sal_Char szServiceName_UnoControlFixedLineModel[],
szServiceName2_UnoControlFixedLineModel[];
+extern const sal_Char szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
+extern const sal_Char szServiceName_UnoControlRoadmap[], szServiceName2_UnoControlRoadmap[];
+extern const sal_Char szServiceName_UnoControlRoadmapModel[],
szServiceName2_UnoControlRoadmapModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[],
szServiceName_UnoSpinButtonModel[];
+extern const sal_Char szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[];
-extern const sal_Char __FAR_DATA szServiceName_TreeControl[];
-extern const sal_Char __FAR_DATA szServiceName_TreeControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[];
+extern const sal_Char szServiceName_TreeControl[];
+extern const sal_Char szServiceName_TreeControlModel[];
+extern const sal_Char szServiceName_MutableTreeDataModel[];
-extern const sal_Char __FAR_DATA szServiceName_GridControl[];
-extern const sal_Char __FAR_DATA szServiceName_GridControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_DefaultGridDataModel[];
-extern const sal_Char __FAR_DATA szServiceName_DefaultGridColumnModel[];
-extern const sal_Char __FAR_DATA szServiceName_GridColumn[];
+extern const sal_Char szServiceName_GridControl[];
+extern const sal_Char szServiceName_GridControlModel[];
+extern const sal_Char szServiceName_DefaultGridDataModel[];
+extern const sal_Char szServiceName_DefaultGridColumnModel[];
+extern const sal_Char szServiceName_GridColumn[];
-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[],
szServiceName2_UnoSimpleAnimationControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[],
szServiceName2_UnoSimpleAnimationControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[],
szServiceName2_UnoThrobberControl[];
-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[],
szServiceName2_UnoThrobberControlModel[];
-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[],
szServiceName_UnoControlFixedHyperlinkModel[];
+extern const sal_Char szServiceName_UnoSimpleAnimationControl[],
szServiceName2_UnoSimpleAnimationControl[];
+extern const sal_Char szServiceName_UnoSimpleAnimationControlModel[],
szServiceName2_UnoSimpleAnimationControlModel[];
+extern const sal_Char szServiceName_UnoThrobberControl[], szServiceName2_UnoThrobberControl[];
+extern const sal_Char szServiceName_UnoThrobberControlModel[],
szServiceName2_UnoThrobberControlModel[];
+extern const sal_Char szServiceName_UnoControlFixedHyperlink[],
szServiceName_UnoControlFixedHyperlinkModel[];
#endif // _TOOLKIT_HELPER_SERVICENAMES_HXX_
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index ff7a9f3..f9b83bf 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -61,7 +61,7 @@
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !pProperties )
{
- static ::com::sun::star::beans::Property __FAR_DATA aPropTable[] =
+ static ::com::sun::star::beans::Property aPropTable[] =
{
::com::sun::star::beans::Property(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Orientation")), PROPERTY_Orientation,
::getCppuType((const sal_Int16*)0), 0 ),
::com::sun::star::beans::Property(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Horizontal")), PROPERTY_Horizontal,
::getBooleanCppuType(), 0 )
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 6cad8dd..58c37c8 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -261,7 +261,7 @@ struct ComponentInfo
WindowType nWinType;
};
-static ComponentInfo __FAR_DATA aComponentInfos [] =
+static ComponentInfo aComponentInfos [] =
{
{ "buttondialog", WINDOW_BUTTONDIALOG },
{ "cancelbutton", WINDOW_CANCELBUTTON },
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index f4e65d0..27b524c 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -121,7 +121,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
if( !pPropertyInfos )
{
- static ImplPropertyInfo __FAR_DATA aImplPropertyInfos [] =
+ static ImplPropertyInfo aImplPropertyInfos [] =
{
DECL_PROP_2 ( "AccessibleName", ACCESSIBLENAME, ::rtl::OUString,
BOUND, MAYBEDEFAULT ),
DECL_PROP_3 ( "Align", ALIGN, sal_Int16,
BOUND, MAYBEDEFAULT, MAYBEVOID ),
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 1fd8ee4..c0fa9c8 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -33,83 +33,83 @@
#include <toolkit/helper/servicenames.hxx>
-const sal_Char __FAR_DATA szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit",
szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit";
-const sal_Char __FAR_DATA szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu",
szServiceName2_PopupMenu[] = "com.sun.star.awt.PopupMenu";
-const sal_Char __FAR_DATA szServiceName_MenuBar[] = "stardiv.vcl.MenuBar",
szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar";
-const sal_Char __FAR_DATA szServiceName_Pointer[] = "stardiv.vcl.Pointer",
szServiceName2_Pointer[] = "com.sun.star.awt.Pointer";
-const sal_Char __FAR_DATA szServiceName_UnoControlContainer[] =
"stardiv.vcl.control.ControlContainer", szServiceName2_UnoControlContainer[] =
"com.sun.star.awt.UnoControlContainer";
+const sal_Char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit", szServiceName2_Toolkit[] =
"com.sun.star.awt.Toolkit";
+const sal_Char szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu", szServiceName2_PopupMenu[] =
"com.sun.star.awt.PopupMenu";
+const sal_Char szServiceName_MenuBar[] = "stardiv.vcl.MenuBar", szServiceName2_MenuBar[] =
"com.sun.star.awt.MenuBar";
+const sal_Char szServiceName_Pointer[] = "stardiv.vcl.Pointer", szServiceName2_Pointer[] =
"com.sun.star.awt.Pointer";
+const sal_Char szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer",
szServiceName2_UnoControlContainer[] = "com.sun.star.awt.UnoControlContainer";
-const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[] =
"stardiv.vcl.controlmodel.ControlContainer", szServiceName2_UnoControlContainerModel[] =
"com.sun.star.awt.UnoControlContainerModel";
-const sal_Char __FAR_DATA szServiceName_TabController[] = "stardiv.vcl.control.TabController",
szServiceName2_TabController[] = "com.sun.star.awt.TabController";
-const sal_Char __FAR_DATA szServiceName_TabControllerModel[] =
"stardiv.vcl.controlmodel.TabController", szServiceName2_TabControllerModel[] =
"com.sun.star.awt.TabControllerModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog",
szServiceName2_UnoControlDialog[] = "com.sun.star.awt.UnoControlDialog";
-const sal_Char __FAR_DATA szServiceName_UnoControlDialogModel[] =
"stardiv.vcl.controlmodel.Dialog", szServiceName2_UnoControlDialogModel[] =
"com.sun.star.awt.UnoControlDialogModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit",
szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit";
-const sal_Char __FAR_DATA szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit",
szServiceName2_UnoControlEditModel[] = "com.sun.star.awt.UnoControlEditModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlFileControl[] =
"stardiv.vcl.control.FileControl", szServiceName2_UnoControlFileControl[] =
"com.sun.star.awt.UnoControlFileControl";
-const sal_Char __FAR_DATA szServiceName_UnoControlFileControlModel[] =
"stardiv.vcl.controlmodel.FileControl", szServiceName2_UnoControlFileControlModel[] =
"com.sun.star.awt.UnoControlFileControlModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button",
szServiceName2_UnoControlButton[] = "com.sun.star.awt.UnoControlButton";
-const sal_Char __FAR_DATA szServiceName_UnoControlButtonModel[] =
"stardiv.vcl.controlmodel.Button", szServiceName2_UnoControlButtonModel[] =
"com.sun.star.awt.UnoControlButtonModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlImageButton[] =
"stardiv.vcl.control.ImageButton", szServiceName2_UnoControlImageButton[] =
"com.sun.star.awt.UnoControlImageButton";
-const sal_Char __FAR_DATA szServiceName_UnoControlImageButtonModel[] =
"stardiv.vcl.controlmodel.ImageButton", szServiceName2_UnoControlImageButtonModel[] =
"com.sun.star.awt.UnoControlImageButtonModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlImageControl[] =
"stardiv.vcl.control.ImageControl", szServiceName2_UnoControlImageControl[] =
"com.sun.star.awt.UnoControlImageControl";
-const sal_Char __FAR_DATA szServiceName_UnoControlImageControlModel[] =
"stardiv.vcl.controlmodel.ImageControl", szServiceName2_UnoControlImageControlModel[] =
"com.sun.star.awt.UnoControlImageControlModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlRadioButton[] =
"stardiv.vcl.control.RadioButton", szServiceName2_UnoControlRadioButton[] =
"com.sun.star.awt.UnoControlRadioButton";
-const sal_Char __FAR_DATA szServiceName_UnoControlRadioButtonModel[] =
"stardiv.vcl.controlmodel.RadioButton", szServiceName2_UnoControlRadioButtonModel[] =
"com.sun.star.awt.UnoControlRadioButtonModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox",
szServiceName2_UnoControlCheckBox[] = "com.sun.star.awt.UnoControlCheckBox";
-const sal_Char __FAR_DATA szServiceName_UnoControlCheckBoxModel[] =
"stardiv.vcl.controlmodel.CheckBox", szServiceName2_UnoControlCheckBoxModel[] =
"com.sun.star.awt.UnoControlCheckBoxModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox",
szServiceName2_UnoControlListBox[] = "com.sun.star.awt.UnoControlListBox";
-const sal_Char __FAR_DATA szServiceName_UnoControlListBoxModel[] =
"stardiv.vcl.controlmodel.ListBox", szServiceName2_UnoControlListBoxModel[] =
"com.sun.star.awt.UnoControlListBoxModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox",
szServiceName2_UnoControlComboBox[] = "com.sun.star.awt.UnoControlComboBox";
-const sal_Char __FAR_DATA szServiceName_UnoControlComboBoxModel[] =
"stardiv.vcl.controlmodel.ComboBox", szServiceName2_UnoControlComboBoxModel[] =
"com.sun.star.awt.UnoControlComboBoxModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText",
szServiceName2_UnoControlFixedText[] = "com.sun.star.awt.UnoControlFixedText";
-const sal_Char __FAR_DATA szServiceName_UnoControlFixedTextModel[] =
"stardiv.vcl.controlmodel.FixedText", szServiceName2_UnoControlFixedTextModel[] =
"com.sun.star.awt.UnoControlFixedTextModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox",
szServiceName2_UnoControlGroupBox[] = "com.sun.star.awt.UnoControlGroupBox";
-const sal_Char __FAR_DATA szServiceName_UnoControlGroupBoxModel[] =
"stardiv.vcl.controlmodel.GroupBox", szServiceName2_UnoControlGroupBoxModel[] =
"com.sun.star.awt.UnoControlGroupBoxModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField",
szServiceName2_UnoControlDateField[] = "com.sun.star.awt.UnoControlDateField";
-const sal_Char __FAR_DATA szServiceName_UnoControlDateFieldModel[] =
"stardiv.vcl.controlmodel.DateField", szServiceName2_UnoControlDateFieldModel[] =
"com.sun.star.awt.UnoControlDateFieldModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField",
szServiceName2_UnoControlTimeField[] = "com.sun.star.awt.UnoControlTimeField";
-const sal_Char __FAR_DATA szServiceName_UnoControlTimeFieldModel[] =
"stardiv.vcl.controlmodel.TimeField", szServiceName2_UnoControlTimeFieldModel[] =
"com.sun.star.awt.UnoControlTimeFieldModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlNumericField[] =
"stardiv.vcl.control.NumericField", szServiceName2_UnoControlNumericField[] =
"com.sun.star.awt.UnoControlNumericField";
-const sal_Char __FAR_DATA szServiceName_UnoControlNumericFieldModel[] =
"stardiv.vcl.controlmodel.NumericField", szServiceName2_UnoControlNumericFieldModel[] =
"com.sun.star.awt.UnoControlNumericFieldModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyField[] =
"stardiv.vcl.control.CurrencyField", szServiceName2_UnoControlCurrencyField[] =
"com.sun.star.awt.UnoControlCurrencyField";
-const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyFieldModel[] =
"stardiv.vcl.controlmodel.CurrencyField", szServiceName2_UnoControlCurrencyFieldModel[] =
"com.sun.star.awt.UnoControlCurrencyFieldModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlPatternField[] =
"stardiv.vcl.control.PatternField", szServiceName2_UnoControlPatternField[] =
"com.sun.star.awt.UnoControlPatternField";
-const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[] =
"stardiv.vcl.controlmodel.PatternField", szServiceName2_UnoControlPatternFieldModel[] =
"com.sun.star.awt.UnoControlPatternFieldModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[] =
"stardiv.vcl.control.FormattedField", szServiceName2_UnoControlFormattedField[] =
"com.sun.star.awt.UnoControlFormattedField";
-const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[] =
"stardiv.vcl.controlmodel.FormattedField", szServiceName2_UnoControlFormattedFieldModel[] =
"com.sun.star.awt.UnoControlFormattedFieldModel";
-const sal_Char __FAR_DATA szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection",
szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection";
-const sal_Char __FAR_DATA szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer",
szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer";
-const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[] =
"stardiv.vcl.control.ProgressBar", szServiceName2_UnoControlProgressBar[] =
"com.sun.star.awt.UnoControlProgressBar";
-const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[] =
"stardiv.vcl.controlmodel.ProgressBar", szServiceName2_UnoControlProgressBarModel[] =
"com.sun.star.awt.UnoControlProgressBarModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar",
szServiceName2_UnoControlScrollBar[] = "com.sun.star.awt.UnoControlScrollBar";
-const sal_Char __FAR_DATA szServiceName_UnoControlScrollBarModel[] =
"stardiv.vcl.controlmodel.ScrollBar", szServiceName2_UnoControlScrollBarModel[] =
"com.sun.star.awt.UnoControlScrollBarModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine",
szServiceName2_UnoControlFixedLine[] = "com.sun.star.awt.UnoControlFixedLine";
-const sal_Char __FAR_DATA szServiceName_UnoControlFixedLineModel[] =
"stardiv.vcl.controlmodel.FixedLine", szServiceName2_UnoControlFixedLineModel[] =
"com.sun.star.awt.UnoControlFixedLineModel";
-const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap",
szServiceName2_UnoControlRoadmap[] = "com.sun.star.awt.UnoControlRoadmap";
-const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[] =
"stardiv.vcl.controlmodel.Roadmap", szServiceName2_UnoControlRoadmapModel[] =
"com.sun.star.awt.UnoControlRoadmapModel";
-const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] =
"com.sun.star.awt.UnoControlSpinButton";
-const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] =
"com.sun.star.awt.UnoControlSpinButtonModel";
-const sal_Char __FAR_DATA szServiceName_UnoMultiPageControl[] =
"com.sun.star.awt.UnoControlMultiPage";
-const sal_Char __FAR_DATA szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
-const sal_Char __FAR_DATA szServiceName_UnoPageControl[] = "com.sun.star.awt.UnoControlPage";
-const sal_Char __FAR_DATA szServiceName_UnoPageModel[] = "com.sun.star.awt.UnoPageModel";
-const sal_Char __FAR_DATA szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFrame";
-const sal_Char __FAR_DATA szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
-const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
-const sal_Char __FAR_DATA szServiceName_TreeControlModel[] =
"com.sun.star.awt.tree.TreeControlModel";
-const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] =
"com.sun.star.awt.tree.MutableTreeDataModel";
-const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControlModel[] =
"com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[]
= "com.sun.star.awt.UnoControlSimpleAnimationModel";
-const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[] =
"com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] =
"com.sun.star.awt.UnoControlSimpleAnimation";
-const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[] =
"com.sun.star.awt.UnoThrobberControlModel", szServiceName2_UnoThrobberControlModel[] =
"com.sun.star.awt.UnoControlThrobberModel";
-const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[] =
"com.sun.star.awt.UnoThrobberControl", szServiceName2_UnoThrobberControl[] =
"com.sun.star.awt.UnoControlThrobber";
-const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[] =
"com.sun.star.awt.UnoControlFixedHyperlink";
-const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlinkModel[] =
"com.sun.star.awt.UnoControlFixedHyperlinkModel";
-const sal_Char __FAR_DATA szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
-const sal_Char __FAR_DATA szServiceName_GridControlModel[] =
"com.sun.star.awt.grid.UnoControlGridModel";
-const sal_Char __FAR_DATA szServiceName_DefaultGridDataModel[] =
"com.sun.star.awt.grid.DefaultGridDataModel";
-const sal_Char __FAR_DATA szServiceName_DefaultGridColumnModel[] =
"com.sun.star.awt.grid.DefaultGridColumnModel";
-const sal_Char __FAR_DATA szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn";
+const sal_Char szServiceName_UnoControlContainerModel[] =
"stardiv.vcl.controlmodel.ControlContainer", szServiceName2_UnoControlContainerModel[] =
"com.sun.star.awt.UnoControlContainerModel";
+const sal_Char szServiceName_TabController[] = "stardiv.vcl.control.TabController",
szServiceName2_TabController[] = "com.sun.star.awt.TabController";
+const sal_Char szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController",
szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel";
+const sal_Char szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog",
szServiceName2_UnoControlDialog[] = "com.sun.star.awt.UnoControlDialog";
+const sal_Char szServiceName_UnoControlDialogModel[] = "stardiv.vcl.controlmodel.Dialog",
szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoControlDialogModel";
+const sal_Char szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit",
szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit";
+const sal_Char szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit",
szServiceName2_UnoControlEditModel[] = "com.sun.star.awt.UnoControlEditModel";
+const sal_Char szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl",
szServiceName2_UnoControlFileControl[] = "com.sun.star.awt.UnoControlFileControl";
+const sal_Char szServiceName_UnoControlFileControlModel[] =
"stardiv.vcl.controlmodel.FileControl", szServiceName2_UnoControlFileControlModel[] =
"com.sun.star.awt.UnoControlFileControlModel";
+const sal_Char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button",
szServiceName2_UnoControlButton[] = "com.sun.star.awt.UnoControlButton";
+const sal_Char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button",
szServiceName2_UnoControlButtonModel[] = "com.sun.star.awt.UnoControlButtonModel";
+const sal_Char szServiceName_UnoControlImageButton[] = "stardiv.vcl.control.ImageButton",
szServiceName2_UnoControlImageButton[] = "com.sun.star.awt.UnoControlImageButton";
+const sal_Char szServiceName_UnoControlImageButtonModel[] =
"stardiv.vcl.controlmodel.ImageButton", szServiceName2_UnoControlImageButtonModel[] =
"com.sun.star.awt.UnoControlImageButtonModel";
+const sal_Char szServiceName_UnoControlImageControl[] = "stardiv.vcl.control.ImageControl",
szServiceName2_UnoControlImageControl[] = "com.sun.star.awt.UnoControlImageControl";
+const sal_Char szServiceName_UnoControlImageControlModel[] =
"stardiv.vcl.controlmodel.ImageControl", szServiceName2_UnoControlImageControlModel[] =
"com.sun.star.awt.UnoControlImageControlModel";
+const sal_Char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton",
szServiceName2_UnoControlRadioButton[] = "com.sun.star.awt.UnoControlRadioButton";
+const sal_Char szServiceName_UnoControlRadioButtonModel[] =
"stardiv.vcl.controlmodel.RadioButton", szServiceName2_UnoControlRadioButtonModel[] =
"com.sun.star.awt.UnoControlRadioButtonModel";
+const sal_Char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox",
szServiceName2_UnoControlCheckBox[] = "com.sun.star.awt.UnoControlCheckBox";
+const sal_Char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox",
szServiceName2_UnoControlCheckBoxModel[] = "com.sun.star.awt.UnoControlCheckBoxModel";
+const sal_Char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox",
szServiceName2_UnoControlListBox[] = "com.sun.star.awt.UnoControlListBox";
+const sal_Char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox",
szServiceName2_UnoControlListBoxModel[] = "com.sun.star.awt.UnoControlListBoxModel";
+const sal_Char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox",
szServiceName2_UnoControlComboBox[] = "com.sun.star.awt.UnoControlComboBox";
+const sal_Char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox",
szServiceName2_UnoControlComboBoxModel[] = "com.sun.star.awt.UnoControlComboBoxModel";
+const sal_Char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText",
szServiceName2_UnoControlFixedText[] = "com.sun.star.awt.UnoControlFixedText";
+const sal_Char szServiceName_UnoControlFixedTextModel[] = "stardiv.vcl.controlmodel.FixedText",
szServiceName2_UnoControlFixedTextModel[] = "com.sun.star.awt.UnoControlFixedTextModel";
+const sal_Char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox",
szServiceName2_UnoControlGroupBox[] = "com.sun.star.awt.UnoControlGroupBox";
+const sal_Char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox",
szServiceName2_UnoControlGroupBoxModel[] = "com.sun.star.awt.UnoControlGroupBoxModel";
+const sal_Char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField",
szServiceName2_UnoControlDateField[] = "com.sun.star.awt.UnoControlDateField";
+const sal_Char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField",
szServiceName2_UnoControlDateFieldModel[] = "com.sun.star.awt.UnoControlDateFieldModel";
+const sal_Char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField",
szServiceName2_UnoControlTimeField[] = "com.sun.star.awt.UnoControlTimeField";
+const sal_Char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField",
szServiceName2_UnoControlTimeFieldModel[] = "com.sun.star.awt.UnoControlTimeFieldModel";
+const sal_Char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField",
szServiceName2_UnoControlNumericField[] = "com.sun.star.awt.UnoControlNumericField";
+const sal_Char szServiceName_UnoControlNumericFieldModel[] =
"stardiv.vcl.controlmodel.NumericField", szServiceName2_UnoControlNumericFieldModel[] =
"com.sun.star.awt.UnoControlNumericFieldModel";
+const sal_Char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField",
szServiceName2_UnoControlCurrencyField[] = "com.sun.star.awt.UnoControlCurrencyField";
+const sal_Char szServiceName_UnoControlCurrencyFieldModel[] =
"stardiv.vcl.controlmodel.CurrencyField", szServiceName2_UnoControlCurrencyFieldModel[] =
"com.sun.star.awt.UnoControlCurrencyFieldModel";
+const sal_Char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField",
szServiceName2_UnoControlPatternField[] = "com.sun.star.awt.UnoControlPatternField";
+const sal_Char szServiceName_UnoControlPatternFieldModel[] =
"stardiv.vcl.controlmodel.PatternField", szServiceName2_UnoControlPatternFieldModel[] =
"com.sun.star.awt.UnoControlPatternFieldModel";
+const sal_Char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField",
szServiceName2_UnoControlFormattedField[] = "com.sun.star.awt.UnoControlFormattedField";
+const sal_Char szServiceName_UnoControlFormattedFieldModel[] =
"stardiv.vcl.controlmodel.FormattedField", szServiceName2_UnoControlFormattedFieldModel[] =
"com.sun.star.awt.UnoControlFormattedFieldModel";
+const sal_Char szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection",
szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection";
+const sal_Char szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer",
szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer";
+const sal_Char szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar",
szServiceName2_UnoControlProgressBar[] = "com.sun.star.awt.UnoControlProgressBar";
+const sal_Char szServiceName_UnoControlProgressBarModel[] =
"stardiv.vcl.controlmodel.ProgressBar", szServiceName2_UnoControlProgressBarModel[] =
"com.sun.star.awt.UnoControlProgressBarModel";
+const sal_Char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar",
szServiceName2_UnoControlScrollBar[] = "com.sun.star.awt.UnoControlScrollBar";
+const sal_Char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar",
szServiceName2_UnoControlScrollBarModel[] = "com.sun.star.awt.UnoControlScrollBarModel";
+const sal_Char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine",
szServiceName2_UnoControlFixedLine[] = "com.sun.star.awt.UnoControlFixedLine";
+const sal_Char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine",
szServiceName2_UnoControlFixedLineModel[] = "com.sun.star.awt.UnoControlFixedLineModel";
+const sal_Char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap",
szServiceName2_UnoControlRoadmap[] = "com.sun.star.awt.UnoControlRoadmap";
+const sal_Char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap",
szServiceName2_UnoControlRoadmapModel[] = "com.sun.star.awt.UnoControlRoadmapModel";
+const sal_Char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton";
+const sal_Char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel";
+const sal_Char szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage";
+const sal_Char szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
+const sal_Char szServiceName_UnoPageControl[] = "com.sun.star.awt.UnoControlPage";
+const sal_Char szServiceName_UnoPageModel[] = "com.sun.star.awt.UnoPageModel";
+const sal_Char szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFrame";
+const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
+const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
+const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
+const sal_Char szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel";
+const sal_Char szServiceName_UnoSimpleAnimationControlModel[] =
"com.sun.star.awt.UnoSimpleAnimationControlModel", szServiceName2_UnoSimpleAnimationControlModel[]
= "com.sun.star.awt.UnoControlSimpleAnimationModel";
+const sal_Char szServiceName_UnoSimpleAnimationControl[] =
"com.sun.star.awt.UnoSimpleAnimationControl", szServiceName2_UnoSimpleAnimationControl[] =
"com.sun.star.awt.UnoControlSimpleAnimation";
+const sal_Char szServiceName_UnoThrobberControlModel[] =
"com.sun.star.awt.UnoThrobberControlModel", szServiceName2_UnoThrobberControlModel[] =
"com.sun.star.awt.UnoControlThrobberModel";
+const sal_Char szServiceName_UnoThrobberControl[] = "com.sun.star.awt.UnoThrobberControl",
szServiceName2_UnoThrobberControl[] = "com.sun.star.awt.UnoControlThrobber";
+const sal_Char szServiceName_UnoControlFixedHyperlink[] =
"com.sun.star.awt.UnoControlFixedHyperlink";
+const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] =
"com.sun.star.awt.UnoControlFixedHyperlinkModel";
+const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
+const sal_Char szServiceName_GridControlModel[] = "com.sun.star.awt.grid.UnoControlGridModel";
+const sal_Char szServiceName_DefaultGridDataModel[] = "com.sun.star.awt.grid.DefaultGridDataModel";
+const sal_Char szServiceName_DefaultGridColumnModel[] =
"com.sun.star.awt.grid.DefaultGridColumnModel";
+const sal_Char szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn";
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 471a11e..0ecaf58 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -87,7 +87,6 @@ typedef sal_uInt32 UINT32; /* typedef unsigned int UINT32;
previously "unsi
#define DELETEZ( p ) ( delete p,p = 0 )
-#define __FAR_DATA
#define __READONLY_DATA const
#define __EXPORT
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index f473ea5..8431cc5 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -110,7 +110,7 @@ using namespace ::com::sun::star::uno;
#define DOCUMENT_BUFFER_SIZE (USHORT)32768
-static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument";
+static const char pStarMathDoc[] = "StarMathDocument";
#define SmDocShell
#include "smslots.hxx"
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 21b34cf..0d70832 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1900,7 +1900,7 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
////////////////////////////////////////////////////////////
-static __FAR_DATA SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
+static SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS },
{ XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH },
@@ -1925,7 +1925,7 @@ static __FAR_DATA SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
+static SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_FONTWEIGHT, XML_TOK_FONTWEIGHT },
{ XML_NAMESPACE_MATH, XML_FONTSTYLE, XML_TOK_FONTSTYLE },
@@ -1935,27 +1935,27 @@ static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aFencedAttrTokenMap[] =
+static SvXMLTokenMapEntry aFencedAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_OPEN, XML_TOK_OPEN },
{ XML_NAMESPACE_MATH, XML_CLOSE, XML_TOK_CLOSE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
+static SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_STRETCHY, XML_TOK_STRETCHY },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
+static SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_ENCODING, XML_TOK_ENCODING },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresElemTokenMap[] =
+static SvXMLTokenMapEntry aPresElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_ANNOTATION, XML_TOK_ANNOTATION },
{ XML_NAMESPACE_MATH, XML_MI, XML_TOK_MI },
@@ -1968,21 +1968,21 @@ static __FAR_DATA SvXMLTokenMapEntry aPresElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
+static SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_MPRESCRIPTS, XML_TOK_MPRESCRIPTS },
{ XML_NAMESPACE_MATH, XML_NONE, XML_TOK_NONE },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aPresTableElemTokenMap[] =
+static SvXMLTokenMapEntry aPresTableElemTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_MTR, XML_TOK_MTR },
{ XML_NAMESPACE_MATH, XML_MTD, XML_TOK_MTD },
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aColorTokenMap[] =
+static SvXMLTokenMapEntry aColorTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_BLACK, TBLACK},
{ XML_NAMESPACE_MATH, XML_WHITE, TWHITE},
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index ddae0b8..02cb10b 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -70,36 +70,36 @@ enum SwCalcOper
//-- Calculate Operations Strings -----------------------------------------
-extern const sal_Char __FAR_DATA sCalc_Add[];
-extern const sal_Char __FAR_DATA sCalc_Sub[];
-extern const sal_Char __FAR_DATA sCalc_Mul[];
-extern const sal_Char __FAR_DATA sCalc_Div[];
-extern const sal_Char __FAR_DATA sCalc_Phd[];
-extern const sal_Char __FAR_DATA sCalc_Sqrt[];
-extern const sal_Char __FAR_DATA sCalc_Pow[];
-extern const sal_Char __FAR_DATA sCalc_Or[];
-extern const sal_Char __FAR_DATA sCalc_Xor[];
-extern const sal_Char __FAR_DATA sCalc_And[];
-extern const sal_Char __FAR_DATA sCalc_Not[];
-extern const sal_Char __FAR_DATA sCalc_Eq[];
-extern const sal_Char __FAR_DATA sCalc_Neq[];
-extern const sal_Char __FAR_DATA sCalc_Leq[];
-extern const sal_Char __FAR_DATA sCalc_Geq[];
-extern const sal_Char __FAR_DATA sCalc_L[];
-extern const sal_Char __FAR_DATA sCalc_G[];
-extern const sal_Char __FAR_DATA sCalc_Sum[];
-extern const sal_Char __FAR_DATA sCalc_Mean[];
-extern const sal_Char __FAR_DATA sCalc_Min[];
-extern const sal_Char __FAR_DATA sCalc_Max[];
-extern const sal_Char __FAR_DATA sCalc_Sin[];
-extern const sal_Char __FAR_DATA sCalc_Cos[];
-extern const sal_Char __FAR_DATA sCalc_Tan[];
-extern const sal_Char __FAR_DATA sCalc_Asin[];
-extern const sal_Char __FAR_DATA sCalc_Acos[];
-extern const sal_Char __FAR_DATA sCalc_Atan[];
-extern const sal_Char __FAR_DATA sCalc_Tdif[];
-extern const sal_Char __FAR_DATA sCalc_Round[];
-extern const sal_Char __FAR_DATA sCalc_Date[];
+extern const sal_Char sCalc_Add[];
+extern const sal_Char sCalc_Sub[];
+extern const sal_Char sCalc_Mul[];
+extern const sal_Char sCalc_Div[];
+extern const sal_Char sCalc_Phd[];
+extern const sal_Char sCalc_Sqrt[];
+extern const sal_Char sCalc_Pow[];
+extern const sal_Char sCalc_Or[];
+extern const sal_Char sCalc_Xor[];
+extern const sal_Char sCalc_And[];
+extern const sal_Char sCalc_Not[];
+extern const sal_Char sCalc_Eq[];
+extern const sal_Char sCalc_Neq[];
+extern const sal_Char sCalc_Leq[];
+extern const sal_Char sCalc_Geq[];
+extern const sal_Char sCalc_L[];
+extern const sal_Char sCalc_G[];
+extern const sal_Char sCalc_Sum[];
+extern const sal_Char sCalc_Mean[];
+extern const sal_Char sCalc_Min[];
+extern const sal_Char sCalc_Max[];
+extern const sal_Char sCalc_Sin[];
+extern const sal_Char sCalc_Cos[];
+extern const sal_Char sCalc_Tan[];
+extern const sal_Char sCalc_Asin[];
+extern const sal_Char sCalc_Acos[];
+extern const sal_Char sCalc_Atan[];
+extern const sal_Char sCalc_Tdif[];
+extern const sal_Char sCalc_Round[];
+extern const sal_Char sCalc_Date[];
/******************************************************************************
* Calculate ErrorCodes
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index f649971..a3a89bb 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -240,7 +240,7 @@ enum SwDateTimeSubType
#ifndef FIELDIDS_ONLY // SWG-Testreader!!
-extern USHORT __FAR_DATA aTypeTab[];
+extern USHORT aTypeTab[];
/*--------------------------------------------------------------------
Beschreibung: Allgemeine Tools
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 537573c..c47e7c1 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -28,7 +28,7 @@
#ifndef _HINTIDS_HXX
#define _HINTIDS_HXX
-#include <tools/solar.h> // for __FAR_DATA
+#include <tools/solar.h>
#include <sal/types.h> // for sal_Unicode
#include "swdllapi.h"
@@ -431,8 +431,8 @@ class SfxPoolItem;
struct SfxItemInfo;
typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ];
-extern SwDfltAttrTab __FAR_DATA aAttrTab;
-extern SfxItemInfo __FAR_DATA aSlotTab[];
+extern SwDfltAttrTab aAttrTab;
+extern SfxItemInfo aSlotTab[];
SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich );
@@ -448,29 +448,29 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
// all Sets defined in init.cxx
// AttrSet-Range for the 3 Break-Attribute
-extern USHORT __FAR_DATA aBreakSetRange[];
+extern USHORT aBreakSetRange[];
// AttrSet-Range for TxtFmtColl
-extern USHORT __FAR_DATA aTxtFmtCollSetRange[];
+extern USHORT aTxtFmtCollSetRange[];
// AttrSet-Range for GrfFmtColl
-extern USHORT __FAR_DATA aGrfFmtCollSetRange[];
+extern USHORT aGrfFmtCollSetRange[];
// AttrSet-Range for TextNode
-SW_DLLPUBLIC extern USHORT __FAR_DATA aTxtNodeSetRange[];
+SW_DLLPUBLIC extern USHORT aTxtNodeSetRange[];
// AttrSet-Range for NoTxtNode
-extern USHORT __FAR_DATA aNoTxtNodeSetRange[];
+extern USHORT aNoTxtNodeSetRange[];
// AttrSet-Range for SwTable
-extern USHORT __FAR_DATA aTableSetRange[];
+extern USHORT aTableSetRange[];
// AttrSet-Range for SwTableLine
-extern USHORT __FAR_DATA aTableLineSetRange[];
+extern USHORT aTableLineSetRange[];
// AttrSet-Range for SwTableBox
-extern USHORT __FAR_DATA aTableBoxSetRange[];
+extern USHORT aTableBoxSetRange[];
// AttrSet-Range for SwFrmFmt
-SW_DLLPUBLIC extern USHORT __FAR_DATA aFrmFmtSetRange[];
+SW_DLLPUBLIC extern USHORT aFrmFmtSetRange[];
// AttrSet-Range for SwCharFmt
-extern USHORT __FAR_DATA aCharFmtSetRange[];
+extern USHORT aCharFmtSetRange[];
// AttrSet-Range for the autostyles
-extern USHORT __FAR_DATA aCharAutoFmtSetRange[];
+extern USHORT aCharAutoFmtSetRange[];
// AttrSet-Range for SwPageDescFmt
-extern USHORT __FAR_DATA aPgFrmFmtSetRange[];
+extern USHORT aPgFrmFmtSetRange[];
// check if ID is InRange of AttrSet-Ids
BOOL IsInRange( const USHORT* pRange, const USHORT nId );
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 66e78df..d9e8137 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -194,13 +194,13 @@ SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev );
// Seperator fuer Sprunge im Dokument auf verschiedene Inhalttype
const sal_Unicode cMarkSeperator = '|';
-extern const sal_Char* __FAR_DATA pMarkToTable; // Strings stehen
-extern const sal_Char* __FAR_DATA pMarkToFrame; // im Init.cxx
-extern const sal_Char* __FAR_DATA pMarkToRegion;
-SW_DLLPUBLIC extern const sal_Char* __FAR_DATA pMarkToOutline;
-extern const sal_Char* __FAR_DATA pMarkToText;
-extern const sal_Char* __FAR_DATA pMarkToGraphic;
-extern const sal_Char* __FAR_DATA pMarkToOLE;
+extern const sal_Char* pMarkToTable; // Strings stehen
+extern const sal_Char* pMarkToFrame; // im Init.cxx
+extern const sal_Char* pMarkToRegion;
+SW_DLLPUBLIC extern const sal_Char* pMarkToOutline;
+extern const sal_Char* pMarkToText;
+extern const sal_Char* pMarkToGraphic;
+extern const sal_Char* pMarkToOLE;
#ifndef DB_DELIM // Ist in OFA definiert!!!
#define DB_DELIM ((sal_Unicode)0xff) // Datenbank <-> Tabellen-Trenner
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 296ed74..9f4b77c 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -69,35 +69,35 @@ using namespace ::com::sun::star;
// tippt sich schneller
#define RESOURCE ViewShell::GetShellRes()
-const sal_Char __FAR_DATA sCalc_Add[] = "add";
-const sal_Char __FAR_DATA sCalc_Sub[] = "sub";
-const sal_Char __FAR_DATA sCalc_Mul[] = "mul";
-const sal_Char __FAR_DATA sCalc_Div[] = "div";
-const sal_Char __FAR_DATA sCalc_Phd[] = "phd";
-const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt";
-const sal_Char __FAR_DATA sCalc_Pow[] = "pow";
-const sal_Char __FAR_DATA sCalc_Or[] = "or";
-const sal_Char __FAR_DATA sCalc_Xor[] = "xor";
-const sal_Char __FAR_DATA sCalc_And[] = "and";
-const sal_Char __FAR_DATA sCalc_Not[] = "not";
-const sal_Char __FAR_DATA sCalc_Eq[] = "eq";
-const sal_Char __FAR_DATA sCalc_Neq[] = "neq";
-const sal_Char __FAR_DATA sCalc_Leq[] = "leq";
-const sal_Char __FAR_DATA sCalc_Geq[] = "geq";
-const sal_Char __FAR_DATA sCalc_L[] = "l";
-const sal_Char __FAR_DATA sCalc_G[] = "g";
-const sal_Char __FAR_DATA sCalc_Sum[] = "sum";
-const sal_Char __FAR_DATA sCalc_Mean[] = "mean";
-const sal_Char __FAR_DATA sCalc_Min[] = "min";
-const sal_Char __FAR_DATA sCalc_Max[] = "max";
-const sal_Char __FAR_DATA sCalc_Sin[] = "sin";
-const sal_Char __FAR_DATA sCalc_Cos[] = "cos";
-const sal_Char __FAR_DATA sCalc_Tan[] = "tan";
-const sal_Char __FAR_DATA sCalc_Asin[] = "asin";
-const sal_Char __FAR_DATA sCalc_Acos[] = "acos";
-const sal_Char __FAR_DATA sCalc_Atan[] = "atan";
-const sal_Char __FAR_DATA sCalc_Round[] = "round";
-const sal_Char __FAR_DATA sCalc_Date[] = "date";
+const sal_Char sCalc_Add[] = "add";
+const sal_Char sCalc_Sub[] = "sub";
+const sal_Char sCalc_Mul[] = "mul";
+const sal_Char sCalc_Div[] = "div";
+const sal_Char sCalc_Phd[] = "phd";
+const sal_Char sCalc_Sqrt[] = "sqrt";
+const sal_Char sCalc_Pow[] = "pow";
+const sal_Char sCalc_Or[] = "or";
+const sal_Char sCalc_Xor[] = "xor";
+const sal_Char sCalc_And[] = "and";
+const sal_Char sCalc_Not[] = "not";
+const sal_Char sCalc_Eq[] = "eq";
+const sal_Char sCalc_Neq[] = "neq";
+const sal_Char sCalc_Leq[] = "leq";
+const sal_Char sCalc_Geq[] = "geq";
+const sal_Char sCalc_L[] = "l";
+const sal_Char sCalc_G[] = "g";
+const sal_Char sCalc_Sum[] = "sum";
+const sal_Char sCalc_Mean[] = "mean";
+const sal_Char sCalc_Min[] = "min";
+const sal_Char sCalc_Max[] = "max";
+const sal_Char sCalc_Sin[] = "sin";
+const sal_Char sCalc_Cos[] = "cos";
+const sal_Char sCalc_Tan[] = "tan";
+const sal_Char sCalc_Asin[] = "asin";
+const sal_Char sCalc_Acos[] = "acos";
+const sal_Char sCalc_Atan[] = "atan";
+const sal_Char sCalc_Round[] = "round";
+const sal_Char sCalc_Date[] = "date";
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 1b42c0e..43fd630 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -147,7 +147,7 @@ extern void ClearFEShellTabCols();
|* einige Bereiche fuer die Set in Collections / Nodes
|*************************************************************************/
// AttrSet-Range fuer die 2 Break-Attribute
-USHORT __FAR_DATA aBreakSetRange[] = {
+USHORT aBreakSetRange[] = {
RES_PAGEDESC, RES_BREAK,
0 };
@@ -155,7 +155,7 @@ USHORT __FAR_DATA aBreakSetRange[] = {
// OD 2008-02-27 #refactorlists# :
// list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not
// included in the paragraph style's itemset.
-USHORT __FAR_DATA aTxtFmtCollSetRange[] = {
+USHORT aTxtFmtCollSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -164,7 +164,7 @@ USHORT __FAR_DATA aTxtFmtCollSetRange[] = {
};
// AttrSet-Range fuer die GrfFmtColl
-USHORT __FAR_DATA aGrfFmtCollSetRange[] = {
+USHORT aGrfFmtCollSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -172,7 +172,7 @@ USHORT __FAR_DATA aGrfFmtCollSetRange[] = {
};
// AttrSet-Range fuer die TextNode
-USHORT __FAR_DATA aTxtNodeSetRange[] = {
+USHORT aTxtNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -184,14 +184,14 @@ USHORT __FAR_DATA aTxtNodeSetRange[] = {
};
// AttrSet-Range fuer die NoTxtNode
-USHORT __FAR_DATA aNoTxtNodeSetRange[] = {
+USHORT aNoTxtNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
-USHORT __FAR_DATA aTableSetRange[] = {
+USHORT aTableSetRange[] = {
RES_FILL_ORDER, RES_FRM_SIZE,
RES_LR_SPACE, RES_BREAK,
RES_BACKGROUND, RES_SHADOW,
@@ -206,7 +206,7 @@ USHORT __FAR_DATA aTableSetRange[] = {
0
};
-USHORT __FAR_DATA aTableLineSetRange[] = {
+USHORT aTableLineSetRange[] = {
RES_FILL_ORDER, RES_FRM_SIZE,
RES_LR_SPACE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
@@ -217,7 +217,7 @@ USHORT __FAR_DATA aTableLineSetRange[] = {
0
};
-USHORT __FAR_DATA aTableBoxSetRange[] = {
+USHORT aTableBoxSetRange[] = {
RES_FILL_ORDER, RES_FRM_SIZE,
RES_LR_SPACE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
@@ -230,21 +230,21 @@ USHORT __FAR_DATA aTableBoxSetRange[] = {
};
// AttrSet-Range fuer die SwFrmFmt
-USHORT __FAR_DATA aFrmFmtSetRange[] = {
+USHORT aFrmFmtSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
// AttrSet-Range fuer die SwCharFmt
-USHORT __FAR_DATA aCharFmtSetRange[] = {
+USHORT aCharFmtSetRange[] = {
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
// AttrSet-Range fuer die character autostyles
-USHORT __FAR_DATA aCharAutoFmtSetRange[] = {
+USHORT aCharAutoFmtSetRange[] = {
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -252,7 +252,7 @@ USHORT __FAR_DATA aCharAutoFmtSetRange[] = {
};
// AttrSet-Range fuer die SwPageDescFmt
-USHORT __FAR_DATA aPgFrmFmtSetRange[] = {
+USHORT aPgFrmFmtSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
@@ -262,9 +262,9 @@ USHORT __FAR_DATA aPgFrmFmtSetRange[] = {
* lege eine Tabelle fuer einen Zugriff auf die
* Default-Format-Attribute an
******************************************************************************/
-SwDfltAttrTab __FAR_DATA aAttrTab;
+SwDfltAttrTab aAttrTab;
-SfxItemInfo __FAR_DATA aSlotTab[] =
+SfxItemInfo aSlotTab[] =
{
{ SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP
{ SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR
@@ -441,13 +441,13 @@ USHORT* SwAttrPool::pVersionMap5 = 0;
USHORT* SwAttrPool::pVersionMap6 = 0;
SwIndexReg* SwIndexReg::pEmptyIndexArray = 0;
-const sal_Char* __FAR_DATA pMarkToTable = "table";
-const sal_Char* __FAR_DATA pMarkToFrame = "frame";
-const sal_Char* __FAR_DATA pMarkToRegion = "region";
-const sal_Char* __FAR_DATA pMarkToText = "text";
-const sal_Char* __FAR_DATA pMarkToOutline = "outline";
-const sal_Char* __FAR_DATA pMarkToGraphic = "graphic";
-const sal_Char* __FAR_DATA pMarkToOLE = "ole";
+const sal_Char* pMarkToTable = "table";
+const sal_Char* pMarkToFrame = "frame";
+const sal_Char* pMarkToRegion = "region";
+const sal_Char* pMarkToText = "text";
+const sal_Char* pMarkToOutline = "outline";
+const sal_Char* pMarkToGraphic = "graphic";
+const sal_Char* pMarkToOLE = "ole";
SvPtrarr *pGlobalOLEExcludeList = 0;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 7dc1642..038388b 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -457,7 +457,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
ParaRstFmt aPara( pStt, pEnd, pHst );
// mst: not including META here; it seems attrs with CH_TXTATR are omitted
- USHORT __FAR_DATA aResetableSetRange[] = {
+ USHORT aResetableSetRange[] = {
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/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 7e78a4b..67dd54a 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -126,12 +126,12 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::document;
-const sal_Char __FAR_DATA sFrmFmtStr[] = "Frameformat";
-const sal_Char __FAR_DATA sEmptyPageStr[] = "Empty Page";
-const sal_Char __FAR_DATA sColumnCntStr[] = "Columncontainer";
-const sal_Char __FAR_DATA sCharFmtStr[] = "Zeichenformat";
-const sal_Char __FAR_DATA sTxtCollStr[] = "Textformatvorlage";
-const sal_Char __FAR_DATA sGrfCollStr[] = "Graphikformatvorlage";
+const sal_Char sFrmFmtStr[] = "Frameformat";
+const sal_Char sEmptyPageStr[] = "Empty Page";
+const sal_Char sColumnCntStr[] = "Columncontainer";
+const sal_Char sCharFmtStr[] = "Zeichenformat";
+const sal_Char sTxtCollStr[] = "Textformatvorlage";
+const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
SV_IMPL_PTRARR( SwNumRuleTbl, SwNumRulePtr)
SV_IMPL_PTRARR( SwTxtFmtColls, SwTxtFmtCollPtr)
@@ -1065,7 +1065,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
{
SwDoc* pRet = new SwDoc;
//copy settings
- USHORT __FAR_DATA aRangeOfDefaults[] = {
+ USHORT aRangeOfDefaults[] = {
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/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index f34af4f..275756c 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -81,7 +81,7 @@ using namespace ::com::sun::star;
const sal_Unicode cNumRepl = '@';
const sal_Unicode cEndPageNum = '~';
-const sal_Char __FAR_DATA sPageDeli[] = ", ";
+const sal_Char sPageDeli[] = ", ";
SV_IMPL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr)
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index f10fa7b..a00eee9 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -93,7 +93,7 @@ const USHORT PT_24 = 24 * 20; // 22 pt
//const USHORT HTML_PARSPACE = ((CM_05 * 7) / 10);
#define HTML_PARSPACE GetMetricVal( CM_05 )
-static const sal_Char __FAR_DATA sKomma[] = ", ";
+static const sal_Char sKomma[] = ", ";
static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
// PT_16, PT_14, PT_14, PT_12, PT_12, // normal
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index b9463a0..0ea7e45 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3110,7 +3110,7 @@ BOOL lcl_BoxSetSplitBoxFmts( const SwTableBox*& rpBox, void* pPara )
}
else
{
-USHORT __FAR_DATA aTableSplitBoxSetRange[] = {
+USHORT aTableSplitBoxSetRange[] = {
RES_LR_SPACE, RES_UL_SPACE,
RES_BACKGROUND, RES_SHADOW,
RES_PROTECT, RES_PROTECT,
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index e9623a1..79b150c 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -89,7 +89,7 @@ SvStringsDtor* SwFieldType::pFldNames = 0;
DBG_NAME(SwFieldType)
- USHORT __FAR_DATA aTypeTab[] = {
+ USHORT aTypeTab[] = {
/* RES_DBFLD */ TYP_DBFLD,
/* RES_USERFLD */ TYP_USERFLD,
/* RES_FILENAMEFLD */ TYP_FILENAMEFLD,
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index f53af9a..10804a6 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -67,7 +67,7 @@
// --> OD 2006-06-27 #b6440955#
// variable moved to class <numfunc:GetDefBulletConfig>
-//extern const sal_Char __FAR_DATA sBulletFntName[];
+//extern const sal_Char sBulletFntName[];
namespace numfunc
{
extern const String& GetDefBulletFontname();
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index cda5370..9477da7 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -104,7 +104,7 @@ using namespace ::com::sun::star::beans;
// --> OD 2006-06-27 #b6440955#
// variable moved to class <numfunc:GetDefBulletConfig>
-//extern const sal_Char __FAR_DATA sBulletFntName[];
+//extern const sal_Char sBulletFntName[];
namespace numfunc
{
extern const String& GetDefBulletFontname();
diff --git a/sw/source/core/text/txtcfg.hxx b/sw/source/core/text/txtcfg.hxx
index 62fe792..68d42db 100644
--- a/sw/source/core/text/txtcfg.hxx
+++ b/sw/source/core/text/txtcfg.hxx
@@ -43,7 +43,7 @@
// Toleranzwert in der Formatierung und Textausgabe.
#define SLOPPY_TWIPS 5
-#define CONSTCHAR( name, string ) static const sal_Char __FAR_DATA name[] = string
+#define CONSTCHAR( name, string ) static const sal_Char name[] = string
// Allgemeines ...
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 735c8c7..b847089 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -222,7 +222,7 @@ SV_IMPL_PTRARR( SwUndoMoves, SwUndoMovePtr )
SV_IMPL_PTRARR( SwTblToTxtSaves, SwTblToTxtSavePtr )
SV_IMPL_PTRARR( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr )
-USHORT __FAR_DATA aSave_BoxCntntSet[] = {
+USHORT aSave_BoxCntntSet[] = {
RES_CHRATR_COLOR, RES_CHRATR_CROSSEDOUT,
RES_CHRATR_FONT, RES_CHRATR_FONTSIZE,
RES_CHRATR_POSTURE, RES_CHRATR_POSTURE,
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 03b97b1..0a9ae54 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -284,7 +284,7 @@ struct ProvNamesId_Type
};
// note: this thing is indexed as an array, so do not insert/remove entries!
-const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
+const ProvNamesId_Type aProvNamesId[] =
{
{ "com.sun.star.text.TextTable", SW_SERVICE_TYPE_TEXTTABLE },
{ "com.sun.star.text.TextFrame", SW_SERVICE_TYPE_TEXTFRAME },
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 4b68034..8792183 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -130,8 +130,8 @@ using ::com::sun::star::frame::XModel;
using ::com::sun::star::container::XNameAccess;
using ::com::sun::star::style::XStyleFamiliesSupplier;
-const sal_Char __FAR_DATA sPackageProtocol[] = "vnd.sun.star.Package:";
-const sal_Char __FAR_DATA sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:";
+const sal_Char sPackageProtocol[] = "vnd.sun.star.Package:";
+const sal_Char sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:";
/****************************************************************************
Rahmenbeschreibung
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index fe43193..91f21bd 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -140,11 +140,11 @@ using namespace ::com::sun::star;
//-----------------------------------------------------------------------
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" );
const sal_Char cCSS1_style_opt_end = '\"';
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" );
+sal_Char CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" );
extern SwAttrFnTab aCSS1AttrFnTab;
diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx
index 31b44b8..ba7ab32 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -34,97 +34,97 @@
/* */
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" );
/* */
// ein par allgemeine Strings
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_import, "import" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_import, "import" );
// Feature: PrintExt
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_page, "page" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_media, "media" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_page, "page" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_media, "media" );
// /Feature: PrintExt
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_important, "important" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_important, "important" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_link, "link" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_link, "link" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" );
// Feature: PrintExt
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_left, "left" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_right, "right" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_first, "first" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_left, "left" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_right, "right" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_first, "first" );
// /Feature: PrintExt
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_url, "url" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_url, "url" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" );
/* */
// Strings fuer Font-Properties
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" );
@@ -132,120 +132,120 @@ sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" );
// Strings fuer Farb- und Hintergrund-Properties
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" );
/* */
// Strings fuer Text-Properties
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" );
/* */
// Strings fuer Box-Properties
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" );
-
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" );
-
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" );
+
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" );
+
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" );
/* */
// Strings fuer Positioning
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" );
/* */
@@ -253,32 +253,32 @@ sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" );
// Strings fuer Printing Extensions
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" );
+//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" );
// /Feature: PrintExt
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" );
-sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" );
+sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" );
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 3134422..e3f8f05 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -40,97 +40,97 @@
/* */
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" );
/* */
// ein par allgemeine Strings
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_import, "import" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_import, "import" );
// Feature: PrintExt
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_page, "page" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_media, "media" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_page, "page" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_media, "media" );
// /Feature: PrintExt
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_important, "important" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_important, "important" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_link, "link" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_link, "link" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" );
// Feature: PrintExt
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_left, "left" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_right, "right" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_first, "first" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_left, "left" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_right, "right" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first, "first" );
// /Feature: PrintExt
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_url, "url" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_url, "url" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" );
/* */
// Strings fuer Font-Properties
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" );
@@ -138,120 +138,120 @@ extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" );
// Strings fuer Farb- und Hintergrund-Properties
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" );
/* */
// Strings fuer Text-Properties
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" );
/* */
// Strings fuer Box-Properties
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width"
);
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width,
"border-bottom-width" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" );
-
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" );
-
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width, "border-bottom-width" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" );
+
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" );
+
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" );
/* */
// Strings fuer Positioning
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" );
/* */
@@ -259,33 +259,33 @@ extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" );
// Strings fuer Printing Extensions
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" );
-//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" );
+//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" );
// /Feature: PrintExt
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" );
-extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" );
+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" );
#endif
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 7bf2edf..e3a1dc7 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -133,7 +133,7 @@ using namespace ::com::sun::star;
//-----------------------------------------------------------------------
-HTMLOutEvent __FAR_DATA aAnchorEventTable[] =
+HTMLOutEvent aAnchorEventTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_O_SDonclick, OOO_STRING_SVTOOLS_HTML_O_onclick,
SFX_EVENT_MOUSECLICK_OBJECT },
{ OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover,
SFX_EVENT_MOUSEOVER_OBJECT },
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 202ee99..0c8131d 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-static HTMLOutEvent __FAR_DATA aBodyEventTable[] =
+static HTMLOutEvent aBodyEventTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload,
SFX_EVENT_OPENDOC },
{ OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload,
SFX_EVENT_PREPARECLOSEDOC },
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index b109454..e8ad309 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -79,7 +79,7 @@ const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
-static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] =
+static HTMLOptionEnum aHTMLMarqBehaviorTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL },
{ OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE },
@@ -87,7 +87,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] =
{ 0, 0
}
};
-static HTMLOptionEnum __FAR_DATA aHTMLMarqDirectionTable[] =
+static HTMLOptionEnum aHTMLMarqDirectionTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT },
{ OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT },
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index a97ee39..5a54381 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -56,7 +56,7 @@ struct HTMLNumFmtTblEntry
NfIndexTableOffset eFmt;
};
-static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] =
+static HTMLOptionEnum aHTMLFldTypeTable[] =
{
{ OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD },
{ OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD },
@@ -70,7 +70,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] =
{ 0, 0 }
};
-static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] =
+static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] =
{
{ "SSYS", NF_DATE_SYSTEM_SHORT },
{ "LSYS", NF_DATE_SYSTEM_LONG },
@@ -92,7 +92,7 @@ static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] =
{ 0, NF_NUMERIC_START }
};
-static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] =
+static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] =
{
{ "SYS", NF_TIME_HHMMSS },
{ "SSMM24", NF_TIME_HHMM },
@@ -100,7 +100,7 @@ static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] =
{ 0, NF_NUMERIC_START }
};
-static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] =
+static HTMLOptionEnum aHTMLPageNumFldFmtTable[] =
{
{ OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER },
{ OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER },
@@ -116,7 +116,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] =
};
-static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] =
+static HTMLOptionEnum aHTMLExtUsrFldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_company, EU_COMPANY },
{ OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME },
@@ -136,14 +136,14 @@ static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum __FAR_DATA aHTMLAuthorFldFmtTable[] =
+static HTMLOptionEnum aHTMLAuthorFldFmtTable[] =
{
{ OOO_STRING_SW_HTML_FF_name, AF_NAME },
{ OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT },
{ 0, 0 }
};
-static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] =
+static HTMLOptionEnum aHTMLPageNumFldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_random, PG_RANDOM },
{ OOO_STRING_SW_HTML_FS_next, PG_NEXT },
@@ -159,7 +159,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] =
const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3;
const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4;
-static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] =
+static HTMLOptionEnum aHTMLDocInfoFldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_title, DI_TITEL },
{ OOO_STRING_SW_HTML_FS_theme, DI_THEMA },
@@ -175,7 +175,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] =
+static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] =
{
{ OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR },
{ OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME },
@@ -183,7 +183,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] =
+static HTMLOptionEnum aHTMLDocStatFldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_page, DS_PAGE },
{ OOO_STRING_SW_HTML_FS_para, DS_PARA },
@@ -195,7 +195,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] =
{ 0, 0 }
};
-static HTMLOptionEnum __FAR_DATA aHTMLFileNameFldFmtTable[] =
+static HTMLOptionEnum aHTMLFileNameFldFmtTable[] =
{
{ OOO_STRING_SW_HTML_FF_name, FF_NAME },
{ OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME },
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 15477ea..dd1d305 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -156,9 +156,9 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
const SdrObject& rSdrObj );
//-----------------------------------------------------------------------
-extern HTMLOutEvent __FAR_DATA aAnchorEventTable[];
+extern HTMLOutEvent aAnchorEventTable[];
-static HTMLOutEvent __FAR_DATA aImageEventTable[] =
+static HTMLOutEvent aImageEventTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload,
SVX_EVENT_IMAGE_LOAD },
{ OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort,
SVX_EVENT_IMAGE_ABORT },
@@ -166,7 +166,7 @@ static HTMLOutEvent __FAR_DATA aImageEventTable[] =
{ 0, 0, 0
}
};
-static HTMLOutEvent __FAR_DATA aIMapEventTable[] =
+static HTMLOutEvent aIMapEventTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover,
SFX_EVENT_MOUSEOVER_OBJECT },
{ OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout,
SFX_EVENT_MOUSEOUT_OBJECT },
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 82d5d08..c6380f4 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -96,14 +96,14 @@ using ::rtl::OUString;
const sal_uInt16 TABINDEX_MIN = 0;
const sal_uInt16 TABINDEX_MAX = 32767;
-static HTMLOptionEnum __FAR_DATA aHTMLFormMethodTable[] =
+static HTMLOptionEnum aHTMLFormMethodTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET },
{ OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST },
{ 0, 0 }
};
-static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] =
+static HTMLOptionEnum aHTMLFormEncTypeTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL },
{ OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART },
@@ -113,7 +113,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] =
enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT };
-static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] =
+static HTMLOptionEnum aHTMLTextAreaWrapTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF },
{ OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD },
@@ -123,7 +123,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] =
{ 0, 0 }
};
-HTMLEventType __FAR_DATA aEventTypeTable[] =
+HTMLEventType aEventTypeTable[] =
{
HTML_ET_ONSUBMITFORM,
HTML_ET_ONRESETFORM,
@@ -136,7 +136,7 @@ HTMLEventType __FAR_DATA aEventTypeTable[] =
HTML_ET_END
};
-const sal_Char * __FAR_DATA aEventListenerTable[] =
+const sal_Char * aEventListenerTable[] =
{
"XSubmitListener",
"XResetListener",
@@ -148,7 +148,7 @@ const sal_Char * __FAR_DATA aEventListenerTable[] =
""
};
-const sal_Char * __FAR_DATA aEventMethodTable[] =
+const sal_Char * aEventMethodTable[] =
{
"approveSubmit",
"approveReset",
@@ -160,7 +160,7 @@ const sal_Char * __FAR_DATA aEventMethodTable[] =
""
};
-const sal_Char * __FAR_DATA aEventSDOptionTable[] =
+const sal_Char * aEventSDOptionTable[] =
{
OOO_STRING_SVTOOLS_HTML_O_SDonsubmit,
OOO_STRING_SVTOOLS_HTML_O_SDonreset,
@@ -172,7 +172,7 @@ const sal_Char * __FAR_DATA aEventSDOptionTable[] =
0
};
-const sal_Char * __FAR_DATA aEventOptionTable[] =
+const sal_Char * aEventOptionTable[] =
{
OOO_STRING_SVTOOLS_HTML_O_onsubmit,
OOO_STRING_SVTOOLS_HTML_O_onreset,
diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx
index d1c510a..9d5f6e2 100644
--- a/sw/source/filter/html/htmlform.hxx
+++ b/sw/source/filter/html/htmlform.hxx
@@ -39,11 +39,11 @@ enum HTMLEventType
HTML_ET_END
};
-extern HTMLEventType __FAR_DATA aEventTypeTable[];
-extern const sal_Char * __FAR_DATA aEventListenerTable[];
-extern const sal_Char * __FAR_DATA aEventMethodTable[];
-extern const sal_Char * __FAR_DATA aEventSDOptionTable[];
-extern const sal_Char * __FAR_DATA aEventOptionTable[];
+extern HTMLEventType aEventTypeTable[];
+extern const sal_Char * aEventListenerTable[];
+extern const sal_Char * aEventMethodTable[];
+extern const sal_Char * aEventSDOptionTable[];
+extern const sal_Char * aEventOptionTable[];
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index a4305d4..6f0996d 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -84,7 +84,7 @@
using namespace ::com::sun::star;
-HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] =
+HTMLOptionEnum aHTMLImgHAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT },
{ OOO_STRING_SVTOOLS_HTML_AL_right, text::HoriOrientation::RIGHT },
@@ -92,7 +92,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] =
};
-HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[] =
+HTMLOptionEnum aHTMLImgVAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::LINE_TOP },
{ OOO_STRING_SVTOOLS_HTML_VA_texttop, text::VertOrientation::CHAR_TOP },
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index d69ffe1..164e6b0 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star;
// <UL TYPE=...>
-static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] =
+static HTMLOptionEnum aHTMLULTypeTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC },
{ OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE },
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index b4a0775..e4c00d3 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -82,7 +82,7 @@
using namespace ::com::sun::star;
-static HTMLOptionEnum __FAR_DATA aHTMLTblVAlignTable[] =
+static HTMLOptionEnum aHTMLTblVAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE },
{ OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER },
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 4f9037f..99bda1d 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -3183,7 +3183,7 @@ struct CSS1PropEntry
// die Tabelle mit den Zuordnungen
-static CSS1PropEntry __FAR_DATA aCSS1PropFnTab[] =
+static CSS1PropEntry aCSS1PropFnTab[] =
{
CSS1_PROP_ENTRY(background),
CSS1_PROP_ENTRY(background_color),
@@ -3241,7 +3241,7 @@ static CSS1PropEntry __FAR_DATA aCSS1PropFnTab[] =
/* */
-static int __FAR_DATA bSortedPropFns = FALSE;
+static int bSortedPropFns = FALSE;
extern "C"
{
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 075dfab..f38e20b 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -133,7 +133,7 @@
using namespace ::com::sun::star;
// <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw.
-HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] =
+HTMLOptionEnum aHTMLPAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_AL_left, SVX_ADJUST_LEFT },
{ OOO_STRING_SVTOOLS_HTML_AL_center, SVX_ADJUST_CENTER },
@@ -145,7 +145,7 @@ HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] =
};
// <SPACER TYPE=...>
-static HTMLOptionEnum __FAR_DATA aHTMLSpacerTypeTable[] =
+static HTMLOptionEnum aHTMLSpacerTypeTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK },
{ OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI },
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 24595ed..70d5382 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -80,9 +80,9 @@ class SvxCSS1PropertyInfo;
#define HTML_DFLT_IMG_HEIGHT (MM50*2)
// ein par Sachen, die man oefter mal braucht
-extern HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[];
-extern HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[];
-extern HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[];
+extern HTMLOptionEnum aHTMLPAlignTable[];
+extern HTMLOptionEnum aHTMLImgHAlignTable[];
+extern HTMLOptionEnum aHTMLImgVAlignTable[];
// der Attribut Stack:
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 05523d6..9fccbe6 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -95,10 +95,10 @@
#if defined(UNX)
const sal_Char SwHTMLWriter::sNewLine = '\012';
#else
-const sal_Char __FAR_DATA SwHTMLWriter::sNewLine[] = "\015\012";
+const sal_Char SwHTMLWriter::sNewLine[] = "\015\012";
#endif
-static sal_Char __FAR_DATA sIndentTabs[MAX_INDENT_LEVEL+2] =
+static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
SwHTMLWriter::SwHTMLWriter( const String& rBaseURL )
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index f561b2e..064e050 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -222,7 +222,7 @@ public:
#if defined(UNX)
static const sal_Char sNewLine; // nur \012 oder \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
SvStringsDtor aImgMapNames; // geschriebene Image Maps
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 3d8029f..9025a7e 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -96,7 +96,7 @@ using sw::mark::IMark;
#if defined(UNX)
const sal_Char RtfExport::sNewLine = '\012';
#else
-const sal_Char __FAR_DATA RtfExport::sNewLine[] = "\015\012";
+const sal_Char RtfExport::sNewLine[] = "\015\012";
#endif
// the default text encoding for the export, if it doesn't fit unicode will
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index 50bd72b..dd696ac 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -163,7 +163,7 @@ public:
#if defined(UNX)
static const sal_Char sNewLine; // \012 or \015
#else
- static const sal_Char __FAR_DATA sNewLine[]; // \015\012
+ static const sal_Char sNewLine[]; // \015\012
#endif
rtl_TextEncoding eDefaultEncoding;
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index d2f555e..cfe911e 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -69,7 +69,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_NGIMG_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
+static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 4cecf9d..bf62950 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -114,7 +114,7 @@ enum SwXMLDocTokens
XML_TOK_OFFICE_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
+static SvXMLTokenMapEntry aDocTokenMap[] =
{
{ XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 685a4e0..3f5ccf0 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -110,7 +110,7 @@ enum SwXMLTableCellAttrTokens
XML_TOK_TABLE_CELL_ATTR_END=XML_TOK_UNKNOWN
};
-static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
+static SvXMLTokenMapEntry aTableElemTokenMap[] =
{
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS,
XML_TOK_TABLE_HEADER_COLS },
@@ -133,7 +133,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] =
XML_TOKEN_MAP_END
};
-static __FAR_DATA SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
+static SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
{
{ XML_NAMESPACE_XML, XML_ID, XML_TOK_TABLE_XMLID },
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME },
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 9bc1b97..b86ac51 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -93,7 +93,7 @@ using ::rtl::OUString;
// is in appenv.cxx
extern String InsertLabEnvText( SwWrtShell& , SwFldMgr& , const String& );
-const char __FAR_DATA MASTER_LABEL[] = "MasterLabel";
+const char MASTER_LABEL[] = "MasterLabel";
const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem,
SwFrmFmt &rFmt,
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 5f47ec0..389fda0 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -83,7 +83,7 @@ using namespace ::com::sun::star::lang;
// Globals ******************************************************************
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
RES_PARATR_DROP, RES_PARATR_DROP,
0
};
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 4f4423f..a1e64f6 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -53,7 +53,7 @@
// Globals ******************************************************************
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT,
0
};
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index a74bcf5..93e0aa1 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -58,7 +58,7 @@
#include "swuiccoll.hxx"
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
FN_COND_COLL, FN_COND_COLL,
0
};
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index dda5965..e82fef5 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1528,7 +1528,7 @@ struct CharAttr
};
// Editieren entspricht Einfuegen-Attributen
-static CharAttr __FAR_DATA aRedlineAttr[] =
+static CharAttr aRedlineAttr[] =
{
{ SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED },
{ SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD },
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 07f245d..24f478e 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -85,7 +85,7 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm
#define MIN_TABWIDTH 120
#define MIN_TABHEIGHT 200
-static const char __FAR_DATA aPostItStr[] = " ";
+static const char aPostItStr[] = " ";
BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
{
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index dcf975d..964040b 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -774,7 +774,7 @@ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageD
void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget )
{
- USHORT __FAR_DATA aRangeOfDefaults[] = {
+ USHORT aRangeOfDefaults[] = {
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/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index ca181cd..4e6d2ce 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -59,8 +59,8 @@
using namespace ::com::sun::star;
const sal_Unicode cDialogExtraDataClose = '}';
-const char __FAR_DATA sDialogImpExtraData[] = "EncImpDlg:{";
-const char __FAR_DATA sDialogExpExtraData[] = "EncExpDlg:{";
+const char sDialogImpExtraData[] = "EncImpDlg:{";
+const char sDialogExpExtraData[] = "EncExpDlg:{";
const USHORT nDialogExtraDataLen = 11; // 12345678901
SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 94d2192..38f99e1 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -144,7 +144,7 @@ enum
/*--------------------------------------------------------------------
Beschreibung: Formate in der richtigen Reihenfolge
--------------------------------------------------------------------*/
-static const USHORT __FAR_DATA aSetFmt[] =
+static const USHORT aSetFmt[] =
{
// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_???
// uebereinstimmen
@@ -152,14 +152,14 @@ static const USHORT __FAR_DATA aSetFmt[] =
0
};
-static const USHORT __FAR_DATA aGetFmt[] =
+static const USHORT aGetFmt[] =
{
// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_???
// uebereinstimmen
0
};
-static const USHORT __FAR_DATA aUsrFmt[] =
+static const USHORT aUsrFmt[] =
{
// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_???
// uebereinstimmen
@@ -167,7 +167,7 @@ static const USHORT __FAR_DATA aUsrFmt[] =
nsSwExtendedSubType::SUB_CMD
};
-static const USHORT __FAR_DATA aDBFmt[] =
+static const USHORT aDBFmt[] =
{
// die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_???
// uebereinstimmen
@@ -195,7 +195,7 @@ struct SwFldPack
/*--------------------------------------------------------------------
Beschreibung: Strings und Formate
--------------------------------------------------------------------*/
-static const SwFldPack __FAR_DATA aSwFlds[] =
+static const SwFldPack aSwFlds[] =
{
// Document
{ TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0,
0 },
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index a788db7..2935530 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -78,7 +78,7 @@ SV_IMPL_PTRARR( SwColumns, SwColumnPtr )
/*--------------------------------------------------------------------
Beschreibung: Statische Daten
--------------------------------------------------------------------*/
-static const USHORT __FAR_DATA nLines[] = {
+static const USHORT nLines[] = {
DEF_LINE_WIDTH_0,
DEF_LINE_WIDTH_1,
DEF_LINE_WIDTH_2,
@@ -390,7 +390,7 @@ USHORT GetMaxWidth( SwColMgr* pColMgr, USHORT nCols )
return nMax;
}
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
RES_COL, RES_COL,
0
};
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx
index 321f772..e20884b 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/ui/frmdlg/frmmgr.cxx
@@ -57,7 +57,7 @@
using namespace ::com::sun::star;
//using namespace text;
-static USHORT __FAR_DATA aFrmMgrRange[] = {
+static USHORT aFrmMgrRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
FN_SET_FRM_NAME, FN_SET_FRM_NAME,
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 2a3f672..59ac2de 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -139,7 +139,7 @@ struct StringIdPair_Impl
#define LB_VERT_LINE 0x00400000L // vertical text line
-static RelationMap __FAR_DATA aRelationMap[] =
+static RelationMap aRelationMap[] =
{
{SwFPos::FRAME, SwFPos::FRAME, LB_FRAME, text::RelOrientation::FRAME},
{SwFPos::PRTAREA, SwFPos::PRTAREA, LB_PRTAREA,
text::RelOrientation::PRINT_AREA},
@@ -165,7 +165,7 @@ static RelationMap __FAR_DATA aRelationMap[] =
{SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, text::RelOrientation::TEXT_LINE}
};
-static RelationMap __FAR_DATA aAsCharRelationMap[] =
+static RelationMap aAsCharRelationMap[] =
{
{SwFPos::REL_BASE, SwFPos::REL_BASE, LB_REL_BASE, text::RelOrientation::FRAME},
{SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB_REL_CHAR, text::RelOrientation::FRAME},
@@ -178,7 +178,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] =
#define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \
LB_REL_PG_RIGHT)
-static FrmMap __FAR_DATA aHPageMap[] =
+static FrmMap aHPageMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT,
HORI_PAGE_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT,
HORI_PAGE_REL},
@@ -186,14 +186,14 @@ static FrmMap __FAR_DATA aHPageMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE,
HORI_PAGE_REL}
};
-static FrmMap __FAR_DATA aHPageHtmlMap[] =
+static FrmMap aHPageHtmlMap[] =
{
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE,
LB_REL_PG_FRAME}
};
#define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
-static FrmMap __FAR_DATA aVPageMap[] =
+static FrmMap aVPageMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
VERT_PAGE_REL},
{SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM,
VERT_PAGE_REL},
@@ -201,7 +201,7 @@ static FrmMap __FAR_DATA aVPageMap[] =
{SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE,
VERT_PAGE_REL}
};
-static FrmMap __FAR_DATA aVPageHtmlMap[] =
+static FrmMap aVPageHtmlMap[] =
{
{SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE,
LB_REL_PG_FRAME}
};
@@ -212,7 +212,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] =
#define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \
LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT)
-static FrmMap __FAR_DATA aHFrameMap[] =
+static FrmMap aHFrameMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_FRAME_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT,
HORI_FRAME_REL},
@@ -220,7 +220,7 @@ static FrmMap __FAR_DATA aHFrameMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE,
HORI_FRAME_REL}
};
-static FrmMap __FAR_DATA aHFlyHtmlMap[] =
+static FrmMap aHFlyHtmlMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT,
LB_FLY_REL_PG_FRAME},
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE,
LB_FLY_REL_PG_FRAME}
@@ -229,7 +229,7 @@ static FrmMap __FAR_DATA aHFlyHtmlMap[] =
// own vertical alignment map for to frame anchored objects
#define VERT_FRAME_REL (LB_FLY_VERT_FRAME|LB_FLY_VERT_PRTAREA)
-static FrmMap __FAR_DATA aVFrameMap[] =
+static FrmMap aVFrameMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
VERT_FRAME_REL},
{SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM,
VERT_FRAME_REL},
@@ -237,7 +237,7 @@ static FrmMap __FAR_DATA aVFrameMap[] =
{SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE,
VERT_FRAME_REL}
};
-static FrmMap __FAR_DATA aVFlyHtmlMap[] =
+static FrmMap aVFlyHtmlMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
LB_FLY_VERT_FRAME},
{SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE,
LB_FLY_VERT_FRAME}
@@ -250,7 +250,7 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] =
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT)
-static FrmMap __FAR_DATA aHParaMap[] =
+static FrmMap aHParaMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT,
HORI_PARA_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT,
HORI_PARA_REL},
@@ -260,13 +260,13 @@ static FrmMap __FAR_DATA aHParaMap[] =
#define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA)
-static FrmMap __FAR_DATA aHParaHtmlMap[] =
+static FrmMap aHParaHtmlMap[] =
{
{SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL},
{SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL}
};
-static FrmMap __FAR_DATA aHParaHtmlAbsMap[] =
+static FrmMap aHParaHtmlAbsMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT,
HTML_HORI_PARA_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT,
HTML_HORI_PARA_REL}
@@ -276,7 +276,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] =
#define VERT_PARA_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
-static FrmMap __FAR_DATA aVParaMap[] =
+static FrmMap aVParaMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
VERT_PARA_REL},
{SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM,
VERT_PARA_REL},
@@ -284,7 +284,7 @@ static FrmMap __FAR_DATA aVParaMap[] =
{SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE,
VERT_PARA_REL}
};
-static FrmMap __FAR_DATA aVParaHtmlMap[] =
+static FrmMap aVParaHtmlMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
LB_VERT_PRTAREA}
};
@@ -296,7 +296,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] =
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \
LB_REL_FRM_RIGHT|LB_REL_CHAR)
-static FrmMap __FAR_DATA aHCharMap[] =
+static FrmMap aHCharMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT,
HORI_CHAR_REL},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT,
HORI_CHAR_REL},
@@ -306,13 +306,13 @@ static FrmMap __FAR_DATA aHCharMap[] =
#define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR)
-static FrmMap __FAR_DATA aHCharHtmlMap[] =
+static FrmMap aHCharHtmlMap[] =
{
{SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT,
HTML_HORI_CHAR_REL},
{SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT,
HTML_HORI_CHAR_REL}
};
-static FrmMap __FAR_DATA aHCharHtmlAbsMap[] =
+static FrmMap aHCharHtmlAbsMap[] =
{
{SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT,
LB_PRTAREA|LB_REL_CHAR},
{SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, LB_PRTAREA},
@@ -323,7 +323,7 @@ static FrmMap __FAR_DATA aHCharHtmlAbsMap[] =
#define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \
LB_REL_PG_FRAME|LB_REL_PG_PRTAREA)
-static FrmMap __FAR_DATA aVCharMap[] =
+static FrmMap aVCharMap[] =
{
// introduce mappings for new vertical alignment at top of line <LB_VERT_LINE>
// and correct mapping for vertical alignment at character for position <FROM_BOTTOM>
@@ -342,12 +342,12 @@ static FrmMap __FAR_DATA aVCharMap[] =
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER,
LB_VERT_LINE}
};
-static FrmMap __FAR_DATA aVCharHtmlMap[] =
+static FrmMap aVCharHtmlMap[] =
{
{SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM,
LB_REL_CHAR}
};
-static FrmMap __FAR_DATA aVCharHtmlAbsMap[] =
+static FrmMap aVCharHtmlAbsMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
LB_REL_CHAR},
{SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM,
LB_REL_CHAR}
@@ -356,7 +356,7 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] =
/*--------------------------------------------------------------------
Beschreibung: Als Zeichen verankert
--------------------------------------------------------------------*/
-static FrmMap __FAR_DATA aVAsCharMap[] =
+static FrmMap aVAsCharMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
LB_REL_BASE},
{SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM,
LB_REL_BASE},
@@ -373,7 +373,7 @@ static FrmMap __FAR_DATA aVAsCharMap[] =
{SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, text::VertOrientation::NONE,
LB_REL_BASE}
};
-static FrmMap __FAR_DATA aVAsCharHtmlMap[] =
+static FrmMap aVAsCharHtmlMap[] =
{
{SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP,
LB_REL_BASE},
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::CENTER,
LB_REL_BASE},
@@ -385,14 +385,14 @@ static FrmMap __FAR_DATA aVAsCharHtmlMap[] =
{SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER,
LB_REL_ROW}
};
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
RES_FRM_SIZE, RES_FRM_SIZE,
RES_VERT_ORIENT, RES_ANCHOR,
RES_COL, RES_COL,
RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW,
0
};
-static USHORT __FAR_DATA aAddPgRg[] = {
+static USHORT aAddPgRg[] = {
RES_PROTECT, RES_PROTECT,
RES_PRINT, RES_PRINT,
FN_SET_FRM_NAME, FN_SET_FRM_NAME,
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 6556ccd..5a38fad 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -61,7 +61,7 @@
using namespace ::com::sun::star;
-static USHORT __FAR_DATA aWrapPageRg[] = {
+static USHORT aWrapPageRg[] = {
RES_LR_SPACE, RES_UL_SPACE,
RES_PROTECT, RES_SURROUND,
RES_PRINT, RES_PRINT,
diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx
index 5e2ba33..90601ec 100644
--- a/sw/source/ui/inc/tabsh.hxx
+++ b/sw/source/ui/inc/tabsh.hxx
@@ -36,7 +36,7 @@ class SwWrtShell;
SW_DLLPUBLIC void ItemSetToTableParam( const SfxItemSet& rSet, SwWrtShell &rSh );
-extern const USHORT __FAR_DATA aUITableAttrRange[];
+extern const USHORT aUITableAttrRange[];
SW_DLLPUBLIC const USHORT* SwuiGetUITableAttrRange();
class SwTableShell: public SwBaseShell
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index f4157fa..5861fa8 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -190,7 +190,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
if(!pExampleFrame || !pExampleFrame->IsInitialized())
return;
- const char* __FAR_DATA IndexServiceNames[] =
+ const char* IndexServiceNames[] =
{
"com.sun.star.text.DocumentIndex",
"com.sun.star.text.UserIndex",
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 018047d..7bd2feb 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -62,7 +62,7 @@
/*-----------------------------------------------------#---------------
Beschreibung: vordefinierte Linien in Point
--------------------------------------------------------------------*/
-static const USHORT __FAR_DATA nLines[] = {
+static const USHORT nLines[] = {
0,
50,
100,
@@ -73,7 +73,7 @@ static const USHORT __FAR_DATA nLines[] = {
static const USHORT nLineCount = SAL_N_ELEMENTS(nLines);
-static USHORT __FAR_DATA aPageRg[] = {
+static USHORT aPageRg[] = {
FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO,
0
};
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 95c8265..cfbff63 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -395,7 +395,7 @@ void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 n
USHORT* SwTextGridPage::GetRanges()
{
- static USHORT __FAR_DATA aPageRg[] = {
+ static USHORT aPageRg[] = {
RES_TEXTGRID, RES_TEXTGRID,
0};
return aPageRg;
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 16fcb3a..33c7ed3 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -120,7 +120,7 @@ SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE))
TYPEINIT1(SwTableShell,SwBaseShell)
-const USHORT __FAR_DATA aUITableAttrRange[] =
+const USHORT aUITableAttrRange[] =
{
FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME,
FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 5cd60bd..07569e4 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -494,7 +494,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
// remove the languages from that)
SvUShortsSort aAttribs;
- USHORT __FAR_DATA aResetableSetRange[] = {
+ USHORT aResetableSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_LANGUAGE - 1,
RES_CHRATR_LANGUAGE + 1, RES_CHRATR_CJK_LANGUAGE - 1,
@@ -506,7 +506,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
- USHORT __FAR_DATA *pUShorts = aResetableSetRange;
+ USHORT *pUShorts = aResetableSetRange;
while (*pUShorts)
{
USHORT nL = pUShorts[1] - pUShorts[0] + 1;
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 938d3e0..9b70ca2 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -143,8 +143,8 @@
#include <svx/ofaitem.hxx>
#include <unomid.h>
-const char __FAR_DATA sStatusDelim[] = " : ";
-const char __FAR_DATA sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by
zhaojianwei
+const char sStatusDelim[] = " : ";
+const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei
using ::rtl::OUString;
using namespace sfx2;
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 53248cf..8e78d84 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -109,7 +109,7 @@ using ::rtl::OUString;
#define GLBL_TABPOS_SUB 5
const SfxObjectShell* SwGlobalTree::pShowShell = 0;
-static const USHORT __FAR_DATA aHelpForMenu[] =
+static const USHORT aHelpForMenu[] =
{
0, //
HID_GLBLTREE_UPDATE, //CTX_UPDATE
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index a7199d0..7a05067 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/ui/utlui/uiitems.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
// Breitenangaben der Fussnotenlinien, mit TabPage abstimmen
-static const USHORT __FAR_DATA nFtnLines[] = {
+static const USHORT nFtnLines[] = {
0,
10,
50,
Context
- [Libreoffice] Remove __FAR_DATA [PATCH] · callahan
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.