[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect binfilter/inc oox/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Dec 6 02:52:30 PST 2010
binfilter/bf_basic/source/classes/sb.cxx | 2
binfilter/bf_sc/source/core/data/sc_cell.cxx | 2
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 2
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 4
binfilter/bf_sc/source/core/tool/sc_editutil.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 6
binfilter/bf_sc/source/core/tool/sc_zforauto.cxx | 2
binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx | 122 +++++-----
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 48 +--
binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx | 4
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 52 ++--
binfilter/bf_sc/source/ui/inc/docsh.hxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_servuno.cxx | 4
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx | 2
binfilter/bf_sd/source/ui/inc/unokywds.hxx | 4
binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 6
binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx | 2
binfilter/bf_starmath/source/starmath_document.cxx | 2
binfilter/bf_starmath/source/starmath_mathml.cxx | 18 -
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 2
binfilter/bf_svx/source/items/svx_paperinf.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xtable.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 56 ++--
binfilter/bf_sw/source/core/bastyp/sw_init.cxx | 40 +--
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 12
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 2
binfilter/bf_sw/source/core/doc/sw_number.cxx | 6
binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 12
binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 6
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 6
binfilter/bf_sw/source/core/text/sw_frmpaint.cxx | 2
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 2
binfilter/bf_sw/source/core/text/txtcfg.hxx | 2
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 4
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_wrtw4w.cxx | 4
binfilter/bf_sw/source/filter/w4w/wrtw4w.hxx | 4
binfilter/bf_sw/source/filter/xml/sw_swxmlat.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmlbrsh.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 4
binfilter/bf_sw/source/ui/app/sw_swcomlib.cxx | 2
binfilter/bf_sw/source/ui/config/sw_viewopt.cxx | 2
binfilter/bf_sw/source/ui/fldui/sw_fldmgr.cxx | 10
binfilter/bf_sw/source/ui/utlui/sw_uiitems.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx | 4
binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx | 22 -
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_XMLSymbolImageContext.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx | 20 -
binfilter/bf_xmloff/source/draw/xmloff_shapeimport.cxx | 20 -
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx | 6
binfilter/bf_xmloff/source/style/xmloff_DashStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_GradientStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_HatchStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_ImageStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_TransGradientStyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_XMLFontStylesContext.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 14 -
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_xmltabi.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteConfigurationImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLFootnoteImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLIndexSourceBaseContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLSectionImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceDDEImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLSectionSourceImportContext.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_XMLTextColumnsContext.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtdropi.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 4
binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx | 18 -
binfilter/bf_xmloff/source/text/xmloff_txtstyli.cxx | 2
binfilter/binfilterdetect/source/bindetect.cxx | 2
binfilter/inc/bf_sc/editutil.hxx | 2
binfilter/inc/bf_svtools/htmlout.hxx | 2
binfilter/inc/bf_svx/xtable.hxx | 2
binfilter/inc/bf_sw/calc.hxx | 58 ++--
binfilter/inc/bf_sw/errhdl.hxx | 6
binfilter/inc/bf_sw/fldbas.hxx | 2
binfilter/inc/bf_sw/hintids.hxx | 28 +-
binfilter/inc/bf_sw/iodetect.hxx | 66 ++---
binfilter/inc/bf_sw/numrule.hxx | 2
binfilter/inc/bf_sw/shellio.hxx | 40 +--
binfilter/inc/bf_sw/swtypes.hxx | 14 -
binfilter/inc/bf_xmloff/xmlkywd.hxx | 4
99 files changed, 444 insertions(+), 444 deletions(-)
New commits:
commit a80edc2203842072971b968179d547b6f774e5f6
Author: Michael Callahan <callahan at xmission.com>
Date: Mon Dec 6 10:36:13 2010 +0000
remove obsolete __FAR_DATA
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 76e7026..4977348 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 4dad61c..930f5bd 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -273,7 +273,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 fce2abb..3085b8a 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 4a0616b..9c51563 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -734,7 +734,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 26b8d11..2977eb8 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 fb043ad..7a5f95c 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 d1cb2dc..b2bb614 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 b8f2fc8..eb7c293 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 8f2137e..6bc3923 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[] =
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list