diff options
| author | Michael Callahan <callahan@xmission.com> | 2010-12-06 10:36:22 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-06 10:36:22 +0000 |
| commit | 74f7f7591c642ab0b7d18d0f9bd44fbd6573431c (patch) | |
| tree | af81105e18b9e6ff3fefc4e1d2febb80672991a7 | |
| parent | 4635182111d70e7c0dfc3a2fc1de61846c82e8a1 (diff) | |
remove obsolete __FAR_DATA
65 files changed, 545 insertions, 545 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index f473ea567f..8431cc507f 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -110,7 +110,7 @@ using namespace ::com::sun::star::uno; #define DOCUMENT_BUFFER_SIZE (USHORT)32768 -static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; +static const char pStarMathDoc[] = "StarMathDocument"; #define SmDocShell #include "smslots.hxx" diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 21b34cf63d..0d70832a24 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -1900,7 +1900,7 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( //////////////////////////////////////////////////////////// -static __FAR_DATA SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = +static SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS }, { XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH }, @@ -1925,7 +1925,7 @@ static __FAR_DATA SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] = +static SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] = { { XML_NAMESPACE_MATH, XML_FONTWEIGHT, XML_TOK_FONTWEIGHT }, { XML_NAMESPACE_MATH, XML_FONTSTYLE, XML_TOK_FONTSTYLE }, @@ -1935,27 +1935,27 @@ static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aFencedAttrTokenMap[] = +static SvXMLTokenMapEntry aFencedAttrTokenMap[] = { { XML_NAMESPACE_MATH, XML_OPEN, XML_TOK_OPEN }, { XML_NAMESPACE_MATH, XML_CLOSE, XML_TOK_CLOSE }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aOperatorAttrTokenMap[] = +static SvXMLTokenMapEntry aOperatorAttrTokenMap[] = { { XML_NAMESPACE_MATH, XML_STRETCHY, XML_TOK_STRETCHY }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aAnnotationAttrTokenMap[] = +static SvXMLTokenMapEntry aAnnotationAttrTokenMap[] = { { XML_NAMESPACE_MATH, XML_ENCODING, XML_TOK_ENCODING }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aPresElemTokenMap[] = +static SvXMLTokenMapEntry aPresElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_ANNOTATION, XML_TOK_ANNOTATION }, { XML_NAMESPACE_MATH, XML_MI, XML_TOK_MI }, @@ -1968,21 +1968,21 @@ static __FAR_DATA SvXMLTokenMapEntry aPresElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] = +static SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_MPRESCRIPTS, XML_TOK_MPRESCRIPTS }, { XML_NAMESPACE_MATH, XML_NONE, XML_TOK_NONE }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aPresTableElemTokenMap[] = +static SvXMLTokenMapEntry aPresTableElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_MTR, XML_TOK_MTR }, { XML_NAMESPACE_MATH, XML_MTD, XML_TOK_MTD }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aColorTokenMap[] = +static SvXMLTokenMapEntry aColorTokenMap[] = { { XML_NAMESPACE_MATH, XML_BLACK, TBLACK}, { XML_NAMESPACE_MATH, XML_WHITE, TWHITE}, diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index ddae0b83ac..02cb10b320 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -70,36 +70,36 @@ enum SwCalcOper //-- Calculate Operations Strings ----------------------------------------- -extern const sal_Char __FAR_DATA sCalc_Add[]; -extern const sal_Char __FAR_DATA sCalc_Sub[]; -extern const sal_Char __FAR_DATA sCalc_Mul[]; -extern const sal_Char __FAR_DATA sCalc_Div[]; -extern const sal_Char __FAR_DATA sCalc_Phd[]; -extern const sal_Char __FAR_DATA sCalc_Sqrt[]; -extern const sal_Char __FAR_DATA sCalc_Pow[]; -extern const sal_Char __FAR_DATA sCalc_Or[]; -extern const sal_Char __FAR_DATA sCalc_Xor[]; -extern const sal_Char __FAR_DATA sCalc_And[]; -extern const sal_Char __FAR_DATA sCalc_Not[]; -extern const sal_Char __FAR_DATA sCalc_Eq[]; -extern const sal_Char __FAR_DATA sCalc_Neq[]; -extern const sal_Char __FAR_DATA sCalc_Leq[]; -extern const sal_Char __FAR_DATA sCalc_Geq[]; -extern const sal_Char __FAR_DATA sCalc_L[]; -extern const sal_Char __FAR_DATA sCalc_G[]; -extern const sal_Char __FAR_DATA sCalc_Sum[]; -extern const sal_Char __FAR_DATA sCalc_Mean[]; -extern const sal_Char __FAR_DATA sCalc_Min[]; -extern const sal_Char __FAR_DATA sCalc_Max[]; -extern const sal_Char __FAR_DATA sCalc_Sin[]; -extern const sal_Char __FAR_DATA sCalc_Cos[]; -extern const sal_Char __FAR_DATA sCalc_Tan[]; -extern const sal_Char __FAR_DATA sCalc_Asin[]; -extern const sal_Char __FAR_DATA sCalc_Acos[]; -extern const sal_Char __FAR_DATA sCalc_Atan[]; -extern const sal_Char __FAR_DATA sCalc_Tdif[]; -extern const sal_Char __FAR_DATA sCalc_Round[]; -extern const sal_Char __FAR_DATA sCalc_Date[]; +extern const sal_Char sCalc_Add[]; +extern const sal_Char sCalc_Sub[]; +extern const sal_Char sCalc_Mul[]; +extern const sal_Char sCalc_Div[]; +extern const sal_Char sCalc_Phd[]; +extern const sal_Char sCalc_Sqrt[]; +extern const sal_Char sCalc_Pow[]; +extern const sal_Char sCalc_Or[]; +extern const sal_Char sCalc_Xor[]; +extern const sal_Char sCalc_And[]; +extern const sal_Char sCalc_Not[]; +extern const sal_Char sCalc_Eq[]; +extern const sal_Char sCalc_Neq[]; +extern const sal_Char sCalc_Leq[]; +extern const sal_Char sCalc_Geq[]; +extern const sal_Char sCalc_L[]; +extern const sal_Char sCalc_G[]; +extern const sal_Char sCalc_Sum[]; +extern const sal_Char sCalc_Mean[]; +extern const sal_Char sCalc_Min[]; +extern const sal_Char sCalc_Max[]; +extern const sal_Char sCalc_Sin[]; +extern const sal_Char sCalc_Cos[]; +extern const sal_Char sCalc_Tan[]; +extern const sal_Char sCalc_Asin[]; +extern const sal_Char sCalc_Acos[]; +extern const sal_Char sCalc_Atan[]; +extern const sal_Char sCalc_Tdif[]; +extern const sal_Char sCalc_Round[]; +extern const sal_Char sCalc_Date[]; /****************************************************************************** * Calculate ErrorCodes diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index f6499718fc..a3a89bbed1 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -240,7 +240,7 @@ enum SwDateTimeSubType #ifndef FIELDIDS_ONLY // SWG-Testreader!! -extern USHORT __FAR_DATA aTypeTab[]; +extern USHORT aTypeTab[]; /*-------------------------------------------------------------------- Beschreibung: Allgemeine Tools diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 537573cd21..c47e7c103e 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -28,7 +28,7 @@ #ifndef _HINTIDS_HXX #define _HINTIDS_HXX -#include <tools/solar.h> // for __FAR_DATA +#include <tools/solar.h> #include <sal/types.h> // for sal_Unicode #include "swdllapi.h" @@ -431,8 +431,8 @@ class SfxPoolItem; struct SfxItemInfo; typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ]; -extern SwDfltAttrTab __FAR_DATA aAttrTab; -extern SfxItemInfo __FAR_DATA aSlotTab[]; +extern SwDfltAttrTab aAttrTab; +extern SfxItemInfo aSlotTab[]; SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich ); @@ -448,29 +448,29 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ); // all Sets defined in init.cxx // AttrSet-Range for the 3 Break-Attribute -extern USHORT __FAR_DATA aBreakSetRange[]; +extern USHORT aBreakSetRange[]; // AttrSet-Range for TxtFmtColl -extern USHORT __FAR_DATA aTxtFmtCollSetRange[]; +extern USHORT aTxtFmtCollSetRange[]; // AttrSet-Range for GrfFmtColl -extern USHORT __FAR_DATA aGrfFmtCollSetRange[]; +extern USHORT aGrfFmtCollSetRange[]; // AttrSet-Range for TextNode -SW_DLLPUBLIC extern USHORT __FAR_DATA aTxtNodeSetRange[]; +SW_DLLPUBLIC extern USHORT aTxtNodeSetRange[]; // AttrSet-Range for NoTxtNode -extern USHORT __FAR_DATA aNoTxtNodeSetRange[]; +extern USHORT aNoTxtNodeSetRange[]; // AttrSet-Range for SwTable -extern USHORT __FAR_DATA aTableSetRange[]; +extern USHORT aTableSetRange[]; // AttrSet-Range for SwTableLine -extern USHORT __FAR_DATA aTableLineSetRange[]; +extern USHORT aTableLineSetRange[]; // AttrSet-Range for SwTableBox -extern USHORT __FAR_DATA aTableBoxSetRange[]; +extern USHORT aTableBoxSetRange[]; // AttrSet-Range for SwFrmFmt -SW_DLLPUBLIC extern USHORT __FAR_DATA aFrmFmtSetRange[]; +SW_DLLPUBLIC extern USHORT aFrmFmtSetRange[]; // AttrSet-Range for SwCharFmt -extern USHORT __FAR_DATA aCharFmtSetRange[]; +extern USHORT aCharFmtSetRange[]; // AttrSet-Range for the autostyles -extern USHORT __FAR_DATA aCharAutoFmtSetRange[]; +extern USHORT aCharAutoFmtSetRange[]; // AttrSet-Range for SwPageDescFmt -extern USHORT __FAR_DATA aPgFrmFmtSetRange[]; +extern USHORT aPgFrmFmtSetRange[]; // check if ID is InRange of AttrSet-Ids BOOL IsInRange( const USHORT* pRange, const USHORT nId ); diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 66e78df686..d9e81371df 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -194,13 +194,13 @@ SW_DLLPUBLIC Size GetGraphicSizeTwip( const Graphic&, OutputDevice* pOutDev ); // Seperator fuer Sprunge im Dokument auf verschiedene Inhalttype const sal_Unicode cMarkSeperator = '|'; -extern const sal_Char* __FAR_DATA pMarkToTable; // Strings stehen -extern const sal_Char* __FAR_DATA pMarkToFrame; // im Init.cxx -extern const sal_Char* __FAR_DATA pMarkToRegion; -SW_DLLPUBLIC extern const sal_Char* __FAR_DATA pMarkToOutline; -extern const sal_Char* __FAR_DATA pMarkToText; -extern const sal_Char* __FAR_DATA pMarkToGraphic; -extern const sal_Char* __FAR_DATA pMarkToOLE; +extern const sal_Char* pMarkToTable; // Strings stehen +extern const sal_Char* pMarkToFrame; // im Init.cxx +extern const sal_Char* pMarkToRegion; +SW_DLLPUBLIC extern const sal_Char* pMarkToOutline; +extern const sal_Char* pMarkToText; +extern const sal_Char* pMarkToGraphic; +extern const sal_Char* pMarkToOLE; #ifndef DB_DELIM // Ist in OFA definiert!!! #define DB_DELIM ((sal_Unicode)0xff) // Datenbank <-> Tabellen-Trenner diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 296ed748bb..9f4b77c0c9 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -69,35 +69,35 @@ using namespace ::com::sun::star; // tippt sich schneller #define RESOURCE ViewShell::GetShellRes() -const sal_Char __FAR_DATA sCalc_Add[] = "add"; -const sal_Char __FAR_DATA sCalc_Sub[] = "sub"; -const sal_Char __FAR_DATA sCalc_Mul[] = "mul"; -const sal_Char __FAR_DATA sCalc_Div[] = "div"; -const sal_Char __FAR_DATA sCalc_Phd[] = "phd"; -const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt"; -const sal_Char __FAR_DATA sCalc_Pow[] = "pow"; -const sal_Char __FAR_DATA sCalc_Or[] = "or"; -const sal_Char __FAR_DATA sCalc_Xor[] = "xor"; -const sal_Char __FAR_DATA sCalc_And[] = "and"; -const sal_Char __FAR_DATA sCalc_Not[] = "not"; -const sal_Char __FAR_DATA sCalc_Eq[] = "eq"; -const sal_Char __FAR_DATA sCalc_Neq[] = "neq"; -const sal_Char __FAR_DATA sCalc_Leq[] = "leq"; -const sal_Char __FAR_DATA sCalc_Geq[] = "geq"; -const sal_Char __FAR_DATA sCalc_L[] = "l"; -const sal_Char __FAR_DATA sCalc_G[] = "g"; -const sal_Char __FAR_DATA sCalc_Sum[] = "sum"; -const sal_Char __FAR_DATA sCalc_Mean[] = "mean"; -const sal_Char __FAR_DATA sCalc_Min[] = "min"; -const sal_Char __FAR_DATA sCalc_Max[] = "max"; -const sal_Char __FAR_DATA sCalc_Sin[] = "sin"; -const sal_Char __FAR_DATA sCalc_Cos[] = "cos"; -const sal_Char __FAR_DATA sCalc_Tan[] = "tan"; -const sal_Char __FAR_DATA sCalc_Asin[] = "asin"; -const sal_Char __FAR_DATA sCalc_Acos[] = "acos"; -const sal_Char __FAR_DATA sCalc_Atan[] = "atan"; -const sal_Char __FAR_DATA sCalc_Round[] = "round"; -const sal_Char __FAR_DATA sCalc_Date[] = "date"; +const sal_Char sCalc_Add[] = "add"; +const sal_Char sCalc_Sub[] = "sub"; +const sal_Char sCalc_Mul[] = "mul"; +const sal_Char sCalc_Div[] = "div"; +const sal_Char sCalc_Phd[] = "phd"; +const sal_Char sCalc_Sqrt[] = "sqrt"; +const sal_Char sCalc_Pow[] = "pow"; +const sal_Char sCalc_Or[] = "or"; +const sal_Char sCalc_Xor[] = "xor"; +const sal_Char sCalc_And[] = "and"; +const sal_Char sCalc_Not[] = "not"; +const sal_Char sCalc_Eq[] = "eq"; +const sal_Char sCalc_Neq[] = "neq"; +const sal_Char sCalc_Leq[] = "leq"; +const sal_Char sCalc_Geq[] = "geq"; +const sal_Char sCalc_L[] = "l"; +const sal_Char sCalc_G[] = "g"; +const sal_Char sCalc_Sum[] = "sum"; +const sal_Char sCalc_Mean[] = "mean"; +const sal_Char sCalc_Min[] = "min"; +const sal_Char sCalc_Max[] = "max"; +const sal_Char sCalc_Sin[] = "sin"; +const sal_Char sCalc_Cos[] = "cos"; +const sal_Char sCalc_Tan[] = "tan"; +const sal_Char sCalc_Asin[] = "asin"; +const sal_Char sCalc_Acos[] = "acos"; +const sal_Char sCalc_Atan[] = "atan"; +const sal_Char sCalc_Round[] = "round"; +const sal_Char sCalc_Date[] = "date"; diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index 1b42c0e09d..43fd6306d1 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -147,7 +147,7 @@ extern void ClearFEShellTabCols(); |* einige Bereiche fuer die Set in Collections / Nodes |*************************************************************************/ // AttrSet-Range fuer die 2 Break-Attribute -USHORT __FAR_DATA aBreakSetRange[] = { +USHORT aBreakSetRange[] = { RES_PAGEDESC, RES_BREAK, 0 }; @@ -155,7 +155,7 @@ USHORT __FAR_DATA aBreakSetRange[] = { // OD 2008-02-27 #refactorlists# : // list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not // included in the paragraph style's itemset. -USHORT __FAR_DATA aTxtFmtCollSetRange[] = { +USHORT aTxtFmtCollSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, @@ -164,7 +164,7 @@ USHORT __FAR_DATA aTxtFmtCollSetRange[] = { }; // AttrSet-Range fuer die GrfFmtColl -USHORT __FAR_DATA aGrfFmtCollSetRange[] = { +USHORT aGrfFmtCollSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_GRFATR_BEGIN, RES_GRFATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, @@ -172,7 +172,7 @@ USHORT __FAR_DATA aGrfFmtCollSetRange[] = { }; // AttrSet-Range fuer die TextNode -USHORT __FAR_DATA aTxtNodeSetRange[] = { +USHORT aTxtNodeSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, @@ -184,14 +184,14 @@ USHORT __FAR_DATA aTxtNodeSetRange[] = { }; // AttrSet-Range fuer die NoTxtNode -USHORT __FAR_DATA aNoTxtNodeSetRange[] = { +USHORT aNoTxtNodeSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_GRFATR_BEGIN, RES_GRFATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 }; -USHORT __FAR_DATA aTableSetRange[] = { +USHORT aTableSetRange[] = { RES_FILL_ORDER, RES_FRM_SIZE, RES_LR_SPACE, RES_BREAK, RES_BACKGROUND, RES_SHADOW, @@ -206,7 +206,7 @@ USHORT __FAR_DATA aTableSetRange[] = { 0 }; -USHORT __FAR_DATA aTableLineSetRange[] = { +USHORT aTableLineSetRange[] = { RES_FILL_ORDER, RES_FRM_SIZE, RES_LR_SPACE, RES_UL_SPACE, RES_BACKGROUND, RES_SHADOW, @@ -217,7 +217,7 @@ USHORT __FAR_DATA aTableLineSetRange[] = { 0 }; -USHORT __FAR_DATA aTableBoxSetRange[] = { +USHORT aTableBoxSetRange[] = { RES_FILL_ORDER, RES_FRM_SIZE, RES_LR_SPACE, RES_UL_SPACE, RES_BACKGROUND, RES_SHADOW, @@ -230,21 +230,21 @@ USHORT __FAR_DATA aTableBoxSetRange[] = { }; // AttrSet-Range fuer die SwFrmFmt -USHORT __FAR_DATA aFrmFmtSetRange[] = { +USHORT aFrmFmtSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 }; // AttrSet-Range fuer die SwCharFmt -USHORT __FAR_DATA aCharFmtSetRange[] = { +USHORT aCharFmtSetRange[] = { RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 }; // AttrSet-Range fuer die character autostyles -USHORT __FAR_DATA aCharAutoFmtSetRange[] = { +USHORT aCharAutoFmtSetRange[] = { RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, @@ -252,7 +252,7 @@ USHORT __FAR_DATA aCharAutoFmtSetRange[] = { }; // AttrSet-Range fuer die SwPageDescFmt -USHORT __FAR_DATA aPgFrmFmtSetRange[] = { +USHORT aPgFrmFmtSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 @@ -262,9 +262,9 @@ USHORT __FAR_DATA aPgFrmFmtSetRange[] = { * lege eine Tabelle fuer einen Zugriff auf die * Default-Format-Attribute an ******************************************************************************/ -SwDfltAttrTab __FAR_DATA aAttrTab; +SwDfltAttrTab aAttrTab; -SfxItemInfo __FAR_DATA aSlotTab[] = +SfxItemInfo aSlotTab[] = { { SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR @@ -441,13 +441,13 @@ USHORT* SwAttrPool::pVersionMap5 = 0; USHORT* SwAttrPool::pVersionMap6 = 0; SwIndexReg* SwIndexReg::pEmptyIndexArray = 0; -const sal_Char* __FAR_DATA pMarkToTable = "table"; -const sal_Char* __FAR_DATA pMarkToFrame = "frame"; -const sal_Char* __FAR_DATA pMarkToRegion = "region"; -const sal_Char* __FAR_DATA pMarkToText = "text"; -const sal_Char* __FAR_DATA pMarkToOutline = "outline"; -const sal_Char* __FAR_DATA pMarkToGraphic = "graphic"; -const sal_Char* __FAR_DATA pMarkToOLE = "ole"; +const sal_Char* pMarkToTable = "table"; +const sal_Char* pMarkToFrame = "frame"; +const sal_Char* pMarkToRegion = "region"; +const sal_Char* pMarkToText = "text"; +const sal_Char* pMarkToOutline = "outline"; +const sal_Char* pMarkToGraphic = "graphic"; +const sal_Char* pMarkToOLE = "ole"; SvPtrarr *pGlobalOLEExcludeList = 0; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 7dc1642a36..038388b81b 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -457,7 +457,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, ParaRstFmt aPara( pStt, pEnd, pHst ); // mst: not including META here; it seems attrs with CH_TXTATR are omitted - USHORT __FAR_DATA aResetableSetRange[] = { + USHORT aResetableSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 7e78a4b9b7..67dd54a0dd 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -126,12 +126,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::document; -const sal_Char __FAR_DATA sFrmFmtStr[] = "Frameformat"; -const sal_Char __FAR_DATA sEmptyPageStr[] = "Empty Page"; -const sal_Char __FAR_DATA sColumnCntStr[] = "Columncontainer"; -const sal_Char __FAR_DATA sCharFmtStr[] = "Zeichenformat"; -const sal_Char __FAR_DATA sTxtCollStr[] = "Textformatvorlage"; -const sal_Char __FAR_DATA sGrfCollStr[] = "Graphikformatvorlage"; +const sal_Char sFrmFmtStr[] = "Frameformat"; +const sal_Char sEmptyPageStr[] = "Empty Page"; +const sal_Char sColumnCntStr[] = "Columncontainer"; +const sal_Char sCharFmtStr[] = "Zeichenformat"; +const sal_Char sTxtCollStr[] = "Textformatvorlage"; +const sal_Char sGrfCollStr[] = "Graphikformatvorlage"; SV_IMPL_PTRARR( SwNumRuleTbl, SwNumRulePtr) SV_IMPL_PTRARR( SwTxtFmtColls, SwTxtFmtCollPtr) @@ -1065,7 +1065,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const { SwDoc* pRet = new SwDoc; //copy settings - USHORT __FAR_DATA aRangeOfDefaults[] = { + USHORT aRangeOfDefaults[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index f34af4f75e..275756cdfa 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -81,7 +81,7 @@ using namespace ::com::sun::star; const sal_Unicode cNumRepl = '@'; const sal_Unicode cEndPageNum = '~'; -const sal_Char __FAR_DATA sPageDeli[] = ", "; +const sal_Char sPageDeli[] = ", "; SV_IMPL_PTRARR(SwTOXSortTabBases, SwTOXSortTabBasePtr) diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index f10fa7b3d6..a00eee90f1 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -93,7 +93,7 @@ const USHORT PT_24 = 24 * 20; // 22 pt //const USHORT HTML_PARSPACE = ((CM_05 * 7) / 10); #define HTML_PARSPACE GetMetricVal( CM_05 ) -static const sal_Char __FAR_DATA sKomma[] = ", "; +static const sal_Char sKomma[] = ", "; static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = { // PT_16, PT_14, PT_14, PT_12, PT_12, // normal diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index b9463a04da..0ea7e458c3 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -3110,7 +3110,7 @@ BOOL lcl_BoxSetSplitBoxFmts( const SwTableBox*& rpBox, void* pPara ) } else { -USHORT __FAR_DATA aTableSplitBoxSetRange[] = { +USHORT aTableSplitBoxSetRange[] = { RES_LR_SPACE, RES_UL_SPACE, RES_BACKGROUND, RES_SHADOW, RES_PROTECT, RES_PROTECT, diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index e9623a1629..79b150cbf3 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -89,7 +89,7 @@ SvStringsDtor* SwFieldType::pFldNames = 0; DBG_NAME(SwFieldType) - USHORT __FAR_DATA aTypeTab[] = { + USHORT aTypeTab[] = { /* RES_DBFLD */ TYP_DBFLD, /* RES_USERFLD */ TYP_USERFLD, /* RES_FILENAMEFLD */ TYP_FILENAMEFLD, diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index f53af9a68e..10804a6368 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -67,7 +67,7 @@ // --> OD 2006-06-27 #b6440955# // variable moved to class <numfunc:GetDefBulletConfig> -//extern const sal_Char __FAR_DATA sBulletFntName[]; +//extern const sal_Char sBulletFntName[]; namespace numfunc { extern const String& GetDefBulletFontname(); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index cda5370827..9477da79b3 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -104,7 +104,7 @@ using namespace ::com::sun::star::beans; // --> OD 2006-06-27 #b6440955# // variable moved to class <numfunc:GetDefBulletConfig> -//extern const sal_Char __FAR_DATA sBulletFntName[]; +//extern const sal_Char sBulletFntName[]; namespace numfunc { extern const String& GetDefBulletFontname(); diff --git a/sw/source/core/text/txtcfg.hxx b/sw/source/core/text/txtcfg.hxx index 62fe7923e4..68d42db016 100644 --- a/sw/source/core/text/txtcfg.hxx +++ b/sw/source/core/text/txtcfg.hxx @@ -43,7 +43,7 @@ // Toleranzwert in der Formatierung und Textausgabe. #define SLOPPY_TWIPS 5 -#define CONSTCHAR( name, string ) static const sal_Char __FAR_DATA name[] = string +#define CONSTCHAR( name, string ) static const sal_Char name[] = string // Allgemeines ... diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 735c8c7340..b847089d92 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -222,7 +222,7 @@ SV_IMPL_PTRARR( SwUndoMoves, SwUndoMovePtr ) SV_IMPL_PTRARR( SwTblToTxtSaves, SwTblToTxtSavePtr ) SV_IMPL_PTRARR( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr ) -USHORT __FAR_DATA aSave_BoxCntntSet[] = { +USHORT aSave_BoxCntntSet[] = { RES_CHRATR_COLOR, RES_CHRATR_CROSSEDOUT, RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 03b97b1098..0a9ae54ce3 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -284,7 +284,7 @@ struct ProvNamesId_Type }; // note: this thing is indexed as an array, so do not insert/remove entries! -const ProvNamesId_Type __FAR_DATA aProvNamesId[] = +const ProvNamesId_Type aProvNamesId[] = { { "com.sun.star.text.TextTable", SW_SERVICE_TYPE_TEXTTABLE }, { "com.sun.star.text.TextFrame", SW_SERVICE_TYPE_TEXTFRAME }, diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 4b68034d05..879218312b 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -130,8 +130,8 @@ using ::com::sun::star::frame::XModel; using ::com::sun::star::container::XNameAccess; using ::com::sun::star::style::XStyleFamiliesSupplier; -const sal_Char __FAR_DATA sPackageProtocol[] = "vnd.sun.star.Package:"; -const sal_Char __FAR_DATA sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:"; +const sal_Char sPackageProtocol[] = "vnd.sun.star.Package:"; +const sal_Char sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:"; /**************************************************************************** Rahmenbeschreibung diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index fe431937b7..91f21bd3a7 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -140,11 +140,11 @@ using namespace ::com::sun::star; //----------------------------------------------------------------------- -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" ); const sal_Char cCSS1_style_opt_end = '\"'; -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" ); +sal_Char CSS1_CONSTASCII_DEF( sHTML_FTN_fontheight, "57%" ); extern SwAttrFnTab aCSS1AttrFnTab; diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index 31b44b8a50..ba7ab32536 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -34,97 +34,97 @@ /* */ -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" ); /* */ // ein par allgemeine Strings -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_import, "import" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_import, "import" ); // Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_page, "page" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_media, "media" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_page, "page" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_media, "media" ); // /Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_important, "important" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_important, "important" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_link, "link" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_link, "link" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_visited, "visited" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_first_letter, "first-letter" ); // Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_left, "left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_right, "right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_first, "first" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_left, "left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_right, "right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_first, "first" ); // /Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_url, "url" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_url, "url" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_rgb, "rgb" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pt, "pt" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_mm, "mm" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_cm, "cm" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_pc, "pc" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_inch, "in" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" ); /* */ // Strings fuer Font-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_serif, "serif" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_sans_serif, "sans-serif" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_light, "light" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_light, "demi-light" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_demi_bold, "demi-bold" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bold, "bold" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_bold, "extra-bold" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_lighter, "lighter" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bolder, "bolder" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_size, "font-size" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_small, "xx-small" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_small, "x-small" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small, "small" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_large, "large" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_x_large, "x-large" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); @@ -132,120 +132,120 @@ sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" ); // Strings fuer Farb- und Hintergrund-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_transparent, "transparent" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat, "repeat" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_x, "repeat-x" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_repeat_y, "repeat-y" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_no_repeat, "no-repeat" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_top, "top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_middle, "middle" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" ); /* */ // Strings fuer Text-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_underline, "underline" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" ); /* */ // Strings fuer Box-Properties -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" ); - -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" ); - -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_right, "margin-right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_top, "margin-top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_bottom, "margin-bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin, "margin" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_top, "padding-top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_bottom, "padding-bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_left, "padding-left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding_right, "padding-right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_padding, "padding" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_auto, "auto" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left_width, "border-left-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right_width, "border-right-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top_width, "border-top-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom_width, "border-bottom-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_width, "border-width" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_color, "border-color" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_style, "border-style" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_left, "border-left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_right, "border-right" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_top, "border-top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border_bottom, "border-bottom" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_border, "border" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thin, "thin" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_medium, "medium" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_thick, "thick" ); + +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dotted, "dotted" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_dashed, "dashed" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_solid, "solid" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_double, "double" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_groove, "groove" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ridge, "ridge" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inset, "inset" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_outset, "outset" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_width, "width" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_height, "height" ); + +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_float, "float" ); /* */ // Strings fuer Positioning -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_position, "position" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_absolute, "absolute" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_relative, "relative" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_static, "static" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); /* */ @@ -253,32 +253,32 @@ sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" ); // Strings fuer Printing Extensions -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_before, "page-break-before" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_after, "page-break-after" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_page_break_inside, "page-break-inside" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_size, "size" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_widows, "widows" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_orphans, "orphans" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_marks, "marks" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_always, "always" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_avoid, "avoid" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_portrait, "portrait" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_landscape, "landscape" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_crop, "crop" ); +//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cross, "cross" ); // /Feature: PrintExt -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_class_abs_pos, "sd-abs-pos" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_so_language, "so-language" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" ); -sal_Char __FAR_DATA CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_direction, "direction" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" ); +sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" ); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index 3134422f37..e3f8f05221 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -40,97 +40,97 @@ /* */ -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" ); /* */ // ein par allgemeine Strings -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_import, "import" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_import, "import" ); // Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_page, "page" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_media, "media" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_page, "page" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_media, "media" ); // /Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_important, "important" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_important, "important" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_link, "link" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_link, "link" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_visited, "visited" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first_letter, "first-letter" ); // Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_left, "left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_right, "right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_first, "first" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_left, "left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_right, "right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_first, "first" ); // /Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_url, "url" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_url, "url" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_rgb, "rgb" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pt, "pt" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_mm, "mm" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_cm, "cm" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_pc, "pc" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_inch, "in" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" ); /* */ // Strings fuer Font-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_serif, "serif" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_sans_serif, "sans-serif" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small_caps, "small-caps" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_weight, "font-weight" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_light, "extra-light" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_light, "light" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_light, "demi-light" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_demi_bold, "demi-bold" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bold, "bold" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_small, "x-small" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_small, "small" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_large, "large" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_x_large, "x-large" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); @@ -138,120 +138,120 @@ extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" ); // Strings fuer Farb- und Hintergrund-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_transparent, "transparent" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat, "repeat" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_x, "repeat-x" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_repeat_y, "repeat-y" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_no_repeat, "no-repeat" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_top, "top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_middle, "middle" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" ); /* */ // Strings fuer Text-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_underline, "underline" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" ); /* */ // Strings fuer Box-Properties -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width, "border-bottom-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" ); - -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" ); - -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_right, "margin-right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_top, "margin-top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_bottom, "margin-bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin, "margin" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_top, "padding-top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_bottom, "padding-bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_left, "padding-left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding_right, "padding-right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_padding, "padding" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_auto, "auto" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left_width, "border-left-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right_width, "border-right-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top_width, "border-top-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom_width, "border-bottom-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_width, "border-width" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_color, "border-color" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_style, "border-style" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_left, "border-left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_right, "border-right" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_top, "border-top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border_bottom, "border-bottom" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_border, "border" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thin, "thin" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_medium, "medium" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_thick, "thick" ); + +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dotted, "dotted" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_dashed, "dashed" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_solid, "solid" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_double, "double" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_groove, "groove" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ridge, "ridge" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inset, "inset" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_outset, "outset" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_width, "width" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_height, "height" ); + +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_float, "float" ); /* */ // Strings fuer Positioning -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_position, "position" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_absolute, "absolute" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_relative, "relative" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_static, "static" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); /* */ @@ -259,33 +259,33 @@ extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" ); // Strings fuer Printing Extensions -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_before, "page-break-before" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_after, "page-break-after" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_page_break_inside, "page-break-inside" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_size, "size" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_widows, "widows" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_orphans, "orphans" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_marks, "marks" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_always, "always" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_avoid, "avoid" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_portrait, "portrait" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" ); -//sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_crop, "crop" ); +//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cross, "cross" ); // /Feature: PrintExt -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" ); -extern sal_Char __FAR_DATA CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" ); +extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" ); #endif diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 7bf2edfa32..e3a1dc7f98 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -133,7 +133,7 @@ using namespace ::com::sun::star; //----------------------------------------------------------------------- -HTMLOutEvent __FAR_DATA aAnchorEventTable[] = +HTMLOutEvent aAnchorEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonclick, OOO_STRING_SVTOOLS_HTML_O_onclick, SFX_EVENT_MOUSECLICK_OBJECT }, { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 202ee99d95..0c8131d98b 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -static HTMLOutEvent __FAR_DATA aBodyEventTable[] = +static HTMLOutEvent aBodyEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC }, { OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC }, diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index b10945464f..e8ad3098ae 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -79,7 +79,7 @@ const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; -static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] = +static HTMLOptionEnum aHTMLMarqBehaviorTable[] = { { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL }, { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE }, @@ -87,7 +87,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLMarqDirectionTable[] = +static HTMLOptionEnum aHTMLMarqDirectionTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT }, diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index a97ee39c0d..5a54381283 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -56,7 +56,7 @@ struct HTMLNumFmtTblEntry NfIndexTableOffset eFmt; }; -static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] = +static HTMLOptionEnum aHTMLFldTypeTable[] = { { OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD }, { OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD }, @@ -70,7 +70,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] = { 0, 0 } }; -static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] = +static HTMLNumFmtTblEntry aHTMLDateFldFmtTable[] = { { "SSYS", NF_DATE_SYSTEM_SHORT }, { "LSYS", NF_DATE_SYSTEM_LONG }, @@ -92,7 +92,7 @@ static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] = { 0, NF_NUMERIC_START } }; -static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] = +static HTMLNumFmtTblEntry aHTMLTimeFldFmtTable[] = { { "SYS", NF_TIME_HHMMSS }, { "SSMM24", NF_TIME_HHMM }, @@ -100,7 +100,7 @@ static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] = { 0, NF_NUMERIC_START } }; -static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] = +static HTMLOptionEnum aHTMLPageNumFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER }, { OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER }, @@ -116,7 +116,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] = }; -static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] = +static HTMLOptionEnum aHTMLExtUsrFldSubTable[] = { { OOO_STRING_SW_HTML_FS_company, EU_COMPANY }, { OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME }, @@ -136,14 +136,14 @@ static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLAuthorFldFmtTable[] = +static HTMLOptionEnum aHTMLAuthorFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_name, AF_NAME }, { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT }, { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = +static HTMLOptionEnum aHTMLPageNumFldSubTable[] = { { OOO_STRING_SW_HTML_FS_random, PG_RANDOM }, { OOO_STRING_SW_HTML_FS_next, PG_NEXT }, @@ -159,7 +159,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3; const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4; -static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] = +static HTMLOptionEnum aHTMLDocInfoFldSubTable[] = { { OOO_STRING_SW_HTML_FS_title, DI_TITEL }, { OOO_STRING_SW_HTML_FS_theme, DI_THEMA }, @@ -175,7 +175,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] = +static HTMLOptionEnum aHTMLDocInfoFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR }, { OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME }, @@ -183,7 +183,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] = +static HTMLOptionEnum aHTMLDocStatFldSubTable[] = { { OOO_STRING_SW_HTML_FS_page, DS_PAGE }, { OOO_STRING_SW_HTML_FS_para, DS_PARA }, @@ -195,7 +195,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] = { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLFileNameFldFmtTable[] = +static HTMLOptionEnum aHTMLFileNameFldFmtTable[] = { { OOO_STRING_SW_HTML_FF_name, FF_NAME }, { OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME }, diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 15477ea723..dd1d3058fb 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -156,9 +156,9 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, const SdrObject& rSdrObj ); //----------------------------------------------------------------------- -extern HTMLOutEvent __FAR_DATA aAnchorEventTable[]; +extern HTMLOutEvent aAnchorEventTable[]; -static HTMLOutEvent __FAR_DATA aImageEventTable[] = +static HTMLOutEvent aImageEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SVX_EVENT_IMAGE_LOAD }, { OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort, SVX_EVENT_IMAGE_ABORT }, @@ -166,7 +166,7 @@ static HTMLOutEvent __FAR_DATA aImageEventTable[] = { 0, 0, 0 } }; -static HTMLOutEvent __FAR_DATA aIMapEventTable[] = +static HTMLOutEvent aIMapEventTable[] = { { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT }, diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 82d5d08052..c6380f4790 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -96,14 +96,14 @@ using ::rtl::OUString; const sal_uInt16 TABINDEX_MIN = 0; const sal_uInt16 TABINDEX_MAX = 32767; -static HTMLOptionEnum __FAR_DATA aHTMLFormMethodTable[] = +static HTMLOptionEnum aHTMLFormMethodTable[] = { { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET }, { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST }, { 0, 0 } }; -static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] = +static HTMLOptionEnum aHTMLFormEncTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL }, { OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART }, @@ -113,7 +113,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] = enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT }; -static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] = +static HTMLOptionEnum aHTMLTextAreaWrapTable[] = { { OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF }, { OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD }, @@ -123,7 +123,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] = { 0, 0 } }; -HTMLEventType __FAR_DATA aEventTypeTable[] = +HTMLEventType aEventTypeTable[] = { HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM, @@ -136,7 +136,7 @@ HTMLEventType __FAR_DATA aEventTypeTable[] = HTML_ET_END }; -const sal_Char * __FAR_DATA aEventListenerTable[] = +const sal_Char * aEventListenerTable[] = { "XSubmitListener", "XResetListener", @@ -148,7 +148,7 @@ const sal_Char * __FAR_DATA aEventListenerTable[] = "" }; -const sal_Char * __FAR_DATA aEventMethodTable[] = +const sal_Char * aEventMethodTable[] = { "approveSubmit", "approveReset", @@ -160,7 +160,7 @@ const sal_Char * __FAR_DATA aEventMethodTable[] = "" }; -const sal_Char * __FAR_DATA aEventSDOptionTable[] = +const sal_Char * aEventSDOptionTable[] = { OOO_STRING_SVTOOLS_HTML_O_SDonsubmit, OOO_STRING_SVTOOLS_HTML_O_SDonreset, @@ -172,7 +172,7 @@ const sal_Char * __FAR_DATA aEventSDOptionTable[] = 0 }; -const sal_Char * __FAR_DATA aEventOptionTable[] = +const sal_Char * aEventOptionTable[] = { OOO_STRING_SVTOOLS_HTML_O_onsubmit, OOO_STRING_SVTOOLS_HTML_O_onreset, diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index d1c510ac72..9d5f6e25b2 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -39,11 +39,11 @@ enum HTMLEventType HTML_ET_END }; -extern HTMLEventType __FAR_DATA aEventTypeTable[]; -extern const sal_Char * __FAR_DATA aEventListenerTable[]; -extern const sal_Char * __FAR_DATA aEventMethodTable[]; -extern const sal_Char * __FAR_DATA aEventSDOptionTable[]; -extern const sal_Char * __FAR_DATA aEventOptionTable[]; +extern HTMLEventType aEventTypeTable[]; +extern const sal_Char * aEventListenerTable[]; +extern const sal_Char * aEventMethodTable[]; +extern const sal_Char * aEventSDOptionTable[]; +extern const sal_Char * aEventOptionTable[]; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index a4305d47bc..6f0996df37 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -84,7 +84,7 @@ using namespace ::com::sun::star; -HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] = +HTMLOptionEnum aHTMLImgHAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_right, text::HoriOrientation::RIGHT }, @@ -92,7 +92,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] = }; -HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[] = +HTMLOptionEnum aHTMLImgVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::LINE_TOP }, { OOO_STRING_SVTOOLS_HTML_VA_texttop, text::VertOrientation::CHAR_TOP }, diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index d69ffe1cef..164e6b0539 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; // <UL TYPE=...> -static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] = +static HTMLOptionEnum aHTMLULTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC }, { OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE }, diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index b4a077507b..e4c00d3c58 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -82,7 +82,7 @@ using namespace ::com::sun::star; -static HTMLOptionEnum __FAR_DATA aHTMLTblVAlignTable[] = +static HTMLOptionEnum aHTMLTblVAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE }, { OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER }, diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 4f9037fd5c..99bda1d22d 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -3183,7 +3183,7 @@ struct CSS1PropEntry // die Tabelle mit den Zuordnungen -static CSS1PropEntry __FAR_DATA aCSS1PropFnTab[] = +static CSS1PropEntry aCSS1PropFnTab[] = { CSS1_PROP_ENTRY(background), CSS1_PROP_ENTRY(background_color), @@ -3241,7 +3241,7 @@ static CSS1PropEntry __FAR_DATA aCSS1PropFnTab[] = /* */ -static int __FAR_DATA bSortedPropFns = FALSE; +static int bSortedPropFns = FALSE; extern "C" { diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 075dfabc34..f38e20b748 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -133,7 +133,7 @@ using namespace ::com::sun::star; // <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw. -HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] = +HTMLOptionEnum aHTMLPAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, SVX_ADJUST_LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_center, SVX_ADJUST_CENTER }, @@ -145,7 +145,7 @@ HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] = }; // <SPACER TYPE=...> -static HTMLOptionEnum __FAR_DATA aHTMLSpacerTypeTable[] = +static HTMLOptionEnum aHTMLSpacerTypeTable[] = { { OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK }, { OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI }, diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 24595edd27..70d538223d 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -80,9 +80,9 @@ class SvxCSS1PropertyInfo; #define HTML_DFLT_IMG_HEIGHT (MM50*2) // ein par Sachen, die man oefter mal braucht -extern HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[]; -extern HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[]; -extern HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[]; +extern HTMLOptionEnum aHTMLPAlignTable[]; +extern HTMLOptionEnum aHTMLImgHAlignTable[]; +extern HTMLOptionEnum aHTMLImgVAlignTable[]; // der Attribut Stack: diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 05523d6ea8..9fccbe6f55 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -95,10 +95,10 @@ #if defined(UNX) const sal_Char SwHTMLWriter::sNewLine = '\012'; #else -const sal_Char __FAR_DATA SwHTMLWriter::sNewLine[] = "\015\012"; +const sal_Char SwHTMLWriter::sNewLine[] = "\015\012"; #endif -static sal_Char __FAR_DATA sIndentTabs[MAX_INDENT_LEVEL+2] = +static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const String& rBaseURL ) diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index f561b2e19b..064e050e82 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -222,7 +222,7 @@ public: #if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else - static const sal_Char __FAR_DATA sNewLine[]; // \015\012 + static const sal_Char sNewLine[]; // \015\012 #endif SvStringsDtor aImgMapNames; // geschriebene Image Maps diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 3d8029f16d..9025a7e56a 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -96,7 +96,7 @@ using sw::mark::IMark; #if defined(UNX) const sal_Char RtfExport::sNewLine = '\012'; #else -const sal_Char __FAR_DATA RtfExport::sNewLine[] = "\015\012"; +const sal_Char RtfExport::sNewLine[] = "\015\012"; #endif // the default text encoding for the export, if it doesn't fit unicode will diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 50bd72b5a2..dd696ac6d3 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -163,7 +163,7 @@ public: #if defined(UNX) static const sal_Char sNewLine; // \012 or \015 #else - static const sal_Char __FAR_DATA sNewLine[]; // \015\012 + static const sal_Char sNewLine[]; // \015\012 #endif rtl_TextEncoding eDefaultEncoding; diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index d2f555e2bc..cfe911e0b4 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -69,7 +69,7 @@ enum SvXMLTokenMapAttrs XML_TOK_NGIMG_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = +static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 4cecf9d705..bf6295016d 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -114,7 +114,7 @@ enum SwXMLDocTokens XML_TOK_OFFICE_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] = +static SvXMLTokenMapEntry aDocTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 685a4e0467..3f5ccf0cb6 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -110,7 +110,7 @@ enum SwXMLTableCellAttrTokens XML_TOK_TABLE_CELL_ATTR_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = +static SvXMLTokenMapEntry aTableElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, @@ -133,7 +133,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTableCellAttrTokenMap[] = +static SvXMLTokenMapEntry aTableCellAttrTokenMap[] = { { XML_NAMESPACE_XML, XML_ID, XML_TOK_TABLE_XMLID }, { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME }, diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 9bc1b97667..b86ac5100c 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -93,7 +93,7 @@ using ::rtl::OUString; // is in appenv.cxx extern String InsertLabEnvText( SwWrtShell& , SwFldMgr& , const String& ); -const char __FAR_DATA MASTER_LABEL[] = "MasterLabel"; +const char MASTER_LABEL[] = "MasterLabel"; const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, SwFrmFmt &rFmt, diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index ac47945b88..726caeeb55 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star::lang; // Globals ****************************************************************** -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { RES_PARATR_DROP, RES_PARATR_DROP, 0 }; diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 4f4423ff1d..a1e64f6e55 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -53,7 +53,7 @@ // Globals ****************************************************************** -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT, 0 }; diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index a74bcf51a9..93e0aa1a14 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -58,7 +58,7 @@ #include "swuiccoll.hxx" -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { FN_COND_COLL, FN_COND_COLL, 0 }; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index dda5965450..e82fef56c5 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1528,7 +1528,7 @@ struct CharAttr }; // Editieren entspricht Einfuegen-Attributen -static CharAttr __FAR_DATA aRedlineAttr[] = +static CharAttr aRedlineAttr[] = { { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED }, { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 07f245d07f..24f478e694 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -85,7 +85,7 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm #define MIN_TABWIDTH 120 #define MIN_TABHEIGHT 200 -static const char __FAR_DATA aPostItStr[] = " "; +static const char aPostItStr[] = " "; BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const { diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index dcf975d7d9..964040ba99 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -774,7 +774,7 @@ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageD void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget ) { - USHORT __FAR_DATA aRangeOfDefaults[] = { + USHORT aRangeOfDefaults[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index ca181cd6fe..4e6d2ce7ae 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -59,8 +59,8 @@ using namespace ::com::sun::star; const sal_Unicode cDialogExtraDataClose = '}'; -const char __FAR_DATA sDialogImpExtraData[] = "EncImpDlg:{"; -const char __FAR_DATA sDialogExpExtraData[] = "EncExpDlg:{"; +const char sDialogImpExtraData[] = "EncImpDlg:{"; +const char sDialogExpExtraData[] = "EncExpDlg:{"; const USHORT nDialogExtraDataLen = 11; // 12345678901 SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 94d2192dae..38f99e14ce 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -144,7 +144,7 @@ enum /*-------------------------------------------------------------------- Beschreibung: Formate in der richtigen Reihenfolge --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA aSetFmt[] = +static const USHORT aSetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -152,14 +152,14 @@ static const USHORT __FAR_DATA aSetFmt[] = 0 }; -static const USHORT __FAR_DATA aGetFmt[] = +static const USHORT aGetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_??? // uebereinstimmen 0 }; -static const USHORT __FAR_DATA aUsrFmt[] = +static const USHORT aUsrFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -167,7 +167,7 @@ static const USHORT __FAR_DATA aUsrFmt[] = nsSwExtendedSubType::SUB_CMD }; -static const USHORT __FAR_DATA aDBFmt[] = +static const USHORT aDBFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_??? // uebereinstimmen @@ -195,7 +195,7 @@ struct SwFldPack /*-------------------------------------------------------------------- Beschreibung: Strings und Formate --------------------------------------------------------------------*/ -static const SwFldPack __FAR_DATA aSwFlds[] = +static const SwFldPack aSwFlds[] = { // Document { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index a788db7060..2935530fe3 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -78,7 +78,7 @@ SV_IMPL_PTRARR( SwColumns, SwColumnPtr ) /*-------------------------------------------------------------------- Beschreibung: Statische Daten --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA nLines[] = { +static const USHORT nLines[] = { DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_1, DEF_LINE_WIDTH_2, @@ -390,7 +390,7 @@ USHORT GetMaxWidth( SwColMgr* pColMgr, USHORT nCols ) return nMax; } -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { RES_COL, RES_COL, 0 }; diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index 321f772643..e20884bf57 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; //using namespace text; -static USHORT __FAR_DATA aFrmMgrRange[] = { +static USHORT aFrmMgrRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, FN_SET_FRM_NAME, FN_SET_FRM_NAME, diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 2a3f672eae..59ac2de9ee 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -139,7 +139,7 @@ struct StringIdPair_Impl #define LB_VERT_LINE 0x00400000L // vertical text line -static RelationMap __FAR_DATA aRelationMap[] = +static RelationMap aRelationMap[] = { {SwFPos::FRAME, SwFPos::FRAME, LB_FRAME, text::RelOrientation::FRAME}, {SwFPos::PRTAREA, SwFPos::PRTAREA, LB_PRTAREA, text::RelOrientation::PRINT_AREA}, @@ -165,7 +165,7 @@ static RelationMap __FAR_DATA aRelationMap[] = {SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, text::RelOrientation::TEXT_LINE} }; -static RelationMap __FAR_DATA aAsCharRelationMap[] = +static RelationMap aAsCharRelationMap[] = { {SwFPos::REL_BASE, SwFPos::REL_BASE, LB_REL_BASE, text::RelOrientation::FRAME}, {SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB_REL_CHAR, text::RelOrientation::FRAME}, @@ -178,7 +178,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] = #define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ LB_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHPageMap[] = +static FrmMap aHPageMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_PAGE_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_PAGE_REL}, @@ -186,14 +186,14 @@ static FrmMap __FAR_DATA aHPageMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_PAGE_REL} }; -static FrmMap __FAR_DATA aHPageHtmlMap[] = +static FrmMap aHPageHtmlMap[] = { {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_REL_PG_FRAME} }; #define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVPageMap[] = +static FrmMap aVPageMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_PAGE_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_PAGE_REL}, @@ -201,7 +201,7 @@ static FrmMap __FAR_DATA aVPageMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_PAGE_REL} }; -static FrmMap __FAR_DATA aVPageHtmlMap[] = +static FrmMap aVPageHtmlMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB_REL_PG_FRAME} }; @@ -212,7 +212,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] = #define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHFrameMap[] = +static FrmMap aHFrameMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_FRAME_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_FRAME_REL}, @@ -220,7 +220,7 @@ static FrmMap __FAR_DATA aHFrameMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_FRAME_REL} }; -static FrmMap __FAR_DATA aHFlyHtmlMap[] = +static FrmMap aHFlyHtmlMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, LB_FLY_REL_PG_FRAME}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} @@ -229,7 +229,7 @@ static FrmMap __FAR_DATA aHFlyHtmlMap[] = // own vertical alignment map for to frame anchored objects #define VERT_FRAME_REL (LB_FLY_VERT_FRAME|LB_FLY_VERT_PRTAREA) -static FrmMap __FAR_DATA aVFrameMap[] = +static FrmMap aVFrameMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_FRAME_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_FRAME_REL}, @@ -237,7 +237,7 @@ static FrmMap __FAR_DATA aVFrameMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_FRAME_REL} }; -static FrmMap __FAR_DATA aVFlyHtmlMap[] = +static FrmMap aVFlyHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_FLY_VERT_FRAME}, {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB_FLY_VERT_FRAME} @@ -250,7 +250,7 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT) -static FrmMap __FAR_DATA aHParaMap[] = +static FrmMap aHParaMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_PARA_REL}, @@ -260,13 +260,13 @@ static FrmMap __FAR_DATA aHParaMap[] = #define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA) -static FrmMap __FAR_DATA aHParaHtmlMap[] = +static FrmMap aHParaHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL} }; -static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = +static FrmMap aHParaHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL} @@ -276,7 +276,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = #define VERT_PARA_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVParaMap[] = +static FrmMap aVParaMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_PARA_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_PARA_REL}, @@ -284,7 +284,7 @@ static FrmMap __FAR_DATA aVParaMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_PARA_REL} }; -static FrmMap __FAR_DATA aVParaHtmlMap[] = +static FrmMap aVParaHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_VERT_PRTAREA} }; @@ -296,7 +296,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharMap[] = +static FrmMap aHCharMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_CHAR_REL}, @@ -306,13 +306,13 @@ static FrmMap __FAR_DATA aHCharMap[] = #define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharHtmlMap[] = +static FrmMap aHCharHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_CHAR_REL} }; -static FrmMap __FAR_DATA aHCharHtmlAbsMap[] = +static FrmMap aHCharHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, LB_PRTAREA|LB_REL_CHAR}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, LB_PRTAREA}, @@ -323,7 +323,7 @@ static FrmMap __FAR_DATA aHCharHtmlAbsMap[] = #define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVCharMap[] = +static FrmMap aVCharMap[] = { // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> @@ -342,12 +342,12 @@ static FrmMap __FAR_DATA aVCharMap[] = {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB_VERT_LINE} }; -static FrmMap __FAR_DATA aVCharHtmlMap[] = +static FrmMap aVCharHtmlMap[] = { {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} }; -static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = +static FrmMap aVCharHtmlAbsMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_CHAR}, {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} @@ -356,7 +356,7 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = /*-------------------------------------------------------------------- Beschreibung: Als Zeichen verankert --------------------------------------------------------------------*/ -static FrmMap __FAR_DATA aVAsCharMap[] = +static FrmMap aVAsCharMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_BASE}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, LB_REL_BASE}, @@ -373,7 +373,7 @@ static FrmMap __FAR_DATA aVAsCharMap[] = {SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, text::VertOrientation::NONE, LB_REL_BASE} }; -static FrmMap __FAR_DATA aVAsCharHtmlMap[] = +static FrmMap aVAsCharHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_BASE}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::CENTER, LB_REL_BASE}, @@ -385,14 +385,14 @@ static FrmMap __FAR_DATA aVAsCharHtmlMap[] = {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB_REL_ROW} }; -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { RES_FRM_SIZE, RES_FRM_SIZE, RES_VERT_ORIENT, RES_ANCHOR, RES_COL, RES_COL, RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW, 0 }; -static USHORT __FAR_DATA aAddPgRg[] = { +static USHORT aAddPgRg[] = { RES_PROTECT, RES_PROTECT, RES_PRINT, RES_PRINT, FN_SET_FRM_NAME, FN_SET_FRM_NAME, diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 6556ccd514..5a38fad66c 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star; -static USHORT __FAR_DATA aWrapPageRg[] = { +static USHORT aWrapPageRg[] = { RES_LR_SPACE, RES_UL_SPACE, RES_PROTECT, RES_SURROUND, RES_PRINT, RES_PRINT, diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx index 5e2ba33f43..90601ec082 100644 --- a/sw/source/ui/inc/tabsh.hxx +++ b/sw/source/ui/inc/tabsh.hxx @@ -36,7 +36,7 @@ class SwWrtShell; SW_DLLPUBLIC void ItemSetToTableParam( const SfxItemSet& rSet, SwWrtShell &rSh ); -extern const USHORT __FAR_DATA aUITableAttrRange[]; +extern const USHORT aUITableAttrRange[]; SW_DLLPUBLIC const USHORT* SwuiGetUITableAttrRange(); class SwTableShell: public SwBaseShell diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index f4157fa004..5861fa88da 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -190,7 +190,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( if(!pExampleFrame || !pExampleFrame->IsInitialized()) return; - const char* __FAR_DATA IndexServiceNames[] = + const char* IndexServiceNames[] = { "com.sun.star.text.DocumentIndex", "com.sun.star.text.UserIndex", diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 018047d651..7bd2febab8 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -62,7 +62,7 @@ /*-----------------------------------------------------#--------------- Beschreibung: vordefinierte Linien in Point --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA nLines[] = { +static const USHORT nLines[] = { 0, 50, 100, @@ -73,7 +73,7 @@ static const USHORT __FAR_DATA nLines[] = { static const USHORT nLineCount = SAL_N_ELEMENTS(nLines); -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, 0 }; diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 95c8265ca4..cfbff63c0f 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -395,7 +395,7 @@ void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 n USHORT* SwTextGridPage::GetRanges() { - static USHORT __FAR_DATA aPageRg[] = { + static USHORT aPageRg[] = { RES_TEXTGRID, RES_TEXTGRID, 0}; return aPageRg; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 16fcb3aa54..33c7ed352b 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -120,7 +120,7 @@ SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE)) TYPEINIT1(SwTableShell,SwBaseShell) -const USHORT __FAR_DATA aUITableAttrRange[] = +const USHORT aUITableAttrRange[] = { FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 5cd60bd342..07569e4931 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -494,7 +494,7 @@ void SwTextShell::Execute(SfxRequest &rReq) // remove the languages from that) SvUShortsSort aAttribs; - USHORT __FAR_DATA aResetableSetRange[] = { + USHORT aResetableSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_LANGUAGE - 1, RES_CHRATR_LANGUAGE + 1, RES_CHRATR_CJK_LANGUAGE - 1, @@ -506,7 +506,7 @@ void SwTextShell::Execute(SfxRequest &rReq) RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 }; - USHORT __FAR_DATA *pUShorts = aResetableSetRange; + USHORT *pUShorts = aResetableSetRange; while (*pUShorts) { USHORT nL = pUShorts[1] - pUShorts[0] + 1; diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 938d3e037f..9b70ca279e 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -143,8 +143,8 @@ #include <svx/ofaitem.hxx> #include <unomid.h> -const char __FAR_DATA sStatusDelim[] = " : "; -const char __FAR_DATA sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei +const char sStatusDelim[] = " : "; +const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei using ::rtl::OUString; using namespace sfx2; diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 53248cf9bf..8e78d84a85 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -109,7 +109,7 @@ using ::rtl::OUString; #define GLBL_TABPOS_SUB 5 const SfxObjectShell* SwGlobalTree::pShowShell = 0; -static const USHORT __FAR_DATA aHelpForMenu[] = +static const USHORT aHelpForMenu[] = { 0, // HID_GLBLTREE_UPDATE, //CTX_UPDATE diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index a7199d0426..7a05067603 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; // Breitenangaben der Fussnotenlinien, mit TabPage abstimmen -static const USHORT __FAR_DATA nFtnLines[] = { +static const USHORT nFtnLines[] = { 0, 10, 50, |