diff options
| author | Michael Callahan <callahan@xmission.com> | 2010-12-06 10:36:18 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-06 10:37:25 +0000 |
| commit | 8a661baf4962f42a9475c3c699d91390e89dee42 (patch) | |
| tree | c92c0adec251373209f0fa68fe8b26fe72360466 | |
| parent | 0b30cb7e66e0cef4f6f75013eb182c2d58615ca1 (diff) | |
remove obsolete __FAR_DATA
41 files changed, 114 insertions, 115 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 4cebf35be0c7..cce50b0223cc 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -118,7 +118,7 @@ struct SFX_VB_ErrorItem SbError nErrorSFX; }; -const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] = +const SFX_VB_ErrorItem SFX_VB_ErrorTab[] = { { 1, SbERR_BASIC_EXCEPTION }, // #87844 Map exception to error code 1 { 2, SbERR_SYNTAX }, diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index dba70f598857..dba70f598857 100755..100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx index 417f1e05d2fc..f15a26569889 100644 --- a/editeng/source/rtf/rtfgrf.cxx +++ b/editeng/source/rtf/rtfgrf.cxx @@ -73,12 +73,12 @@ void GrfWindow::Paint( const Rectangle& ) } #endif -static BYTE __FAR_DATA aPal1[ 2 * 4 ] = { +static BYTE aPal1[ 2 * 4 ] = { 0x00, 0x00, 0x00, 0x00, // Schwarz 0xFF, 0xFF, 0xFF, 0x00 // Weiss }; -static BYTE __FAR_DATA aPal4[ 16 * 4 ] = { +static BYTE aPal4[ 16 * 4 ] = { 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, @@ -97,7 +97,7 @@ static BYTE __FAR_DATA aPal4[ 16 * 4 ] = { 0xFF, 0xFF, 0xFF, 0x00 }; -static BYTE __FAR_DATA aPal8[ 256 * 4 ] = +static BYTE aPal8[ 256 * 4 ] = { 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00, 0x80, 0x92, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x00, 0x80, 0x00, 0xAA, 0x00, diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index a69b87ebae0c..74390bd040b8 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -110,7 +110,7 @@ enum SfxSlotKind struct SfxTypeAttrib { USHORT nAID; - const char __FAR_DATA* pName; + const char* pName; }; struct SfxType @@ -223,8 +223,8 @@ SFX_DECL_TYPE(18); // for SvxSearchItem } #define SFX_SLOTMAP_NONE(ShellClass) \ - static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[1]; \ - static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] = \ + static SfxFormalArgument a##ShellClass##Args_Impl[1]; \ + static SfxSlot a##ShellClass##Slots_Impl[] = \ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } #define SFX_ARGUMENT( ArgSlotId, ArgName, ArgTypeId ) \ @@ -237,7 +237,7 @@ class SfxPoolItem; struct SfxFormalArgument { const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse) - const char __FAR_DATA* pName; // Name des Parameters + const char* pName; // Name des Parameters USHORT nSlotId;// Slot-Id zur Identifikation des Parameters const TypeId& Type() const @@ -263,8 +263,8 @@ public: SfxStateFunc fnState; // Funktion f"ur Status const SfxType* pType; // SfxPoolItem-Typ (Status) - const char __FAR_DATA* pName; // Name des Slots - const char __FAR_DATA* pMethodName; // Name der Method falls anders + const char* pName; // Name des Slots + const char* pMethodName; // Name der Method falls anders const SfxSlot* pLinkedSlot; // Master-Slot f"ur Enum-Werte const SfxSlot* pNextSlot; // mit derselben Status-Methode @@ -273,7 +273,7 @@ public: USHORT nArgDefCount; // Anzahl der formalen Argumente long nDisableFlags; // DisableFlags, die vorhanden sein // m"ussen, damit der Slot enabled ist - const char __FAR_DATA* pUnoName; // UnoName des Slots + const char* pUnoName; // UnoName des Slots public: diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 869833475ba3..125dada223f8 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -301,12 +301,12 @@ inline void SfxShell::SetPool //===================================================================== -#define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[] = +#define SFX_ARGUMENTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[] = -#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument __FAR_DATA a##ShellClass##Args_Impl[1]; \ - static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] = +#define SFX_SLOTMAP(ShellClass) static SfxFormalArgument a##ShellClass##Args_Impl[1]; \ + static SfxSlot a##ShellClass##Slots_Impl[] = -#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot __FAR_DATA a##ShellClass##Slots_Impl[] = +#define SFX_SLOTMAP_ARG(ShellClass) static SfxSlot a##ShellClass##Slots_Impl[] = #define SFX_DECL_INTERFACE(nId) \ static SfxInterface* pInterface; \ diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 38f06f0e28a2..e8d8c2d39c2d 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -67,7 +67,7 @@ static sal_Char __READONLY_DATA sHTML_SC_auto[] = "AUTO"; static sal_Char __READONLY_DATA sHTML_MIME_text_html[] = "text/html; charset="; /* not used anymore? -static HTMLOutEvent __FAR_DATA aFrameSetEventTable[] = +static HTMLOutEvent aFrameSetEventTable[] = { { sHTML_O_SDonload, sHTML_O_onload, SFX_EVENT_OPENDOC }, { sHTML_O_SDonunload, sHTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC }, @@ -80,7 +80,7 @@ static HTMLOutEvent __FAR_DATA aFrameSetEventTable[] = #if defined(UNX) const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012"; #else -const sal_Char __FAR_DATA SfxFrameHTMLWriter::sNewLine[] = "\015\012"; +const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012"; #endif void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 16d76a298118..80da8b678727 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -58,9 +58,9 @@ using namespace ::com::sun::star; -sal_Char __FAR_DATA sHTML_MIME_text[] = "text/"; -sal_Char __FAR_DATA sHTML_MIME_application[] = "application/"; -sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-"; +sal_Char sHTML_MIME_text[] = "text/"; +sal_Char sHTML_MIME_application[] = "application/"; +sal_Char sHTML_MIME_experimental[] = "x-"; // <INPUT TYPE=xxx> static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] = diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index c2d79b59ecd6..a6562ee64464 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -55,7 +55,7 @@ class XOutdevItemPool; #define BITMAP_HEIGHT 12 // Standard-Vergleichsstring -extern sal_Unicode __FAR_DATA pszStandard[]; // "standard" +extern sal_Unicode pszStandard[]; // "standard" // Funktion zum Konvertieren in echte RGB-Farben, da mit // enum COL_NAME nicht verglichen werden kann. diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 949cd9e84e03..279624e84530 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -35,7 +35,7 @@ #define GLOBALOVERFLOW // Vergleichsstrings -sal_Unicode __FAR_DATA pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 }; +sal_Unicode pszStandard[] = { 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', 0 }; // Konvertiert in echte RGB-Farben, damit in den Listboxen // endlich mal richtig selektiert werden kann. diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index d71d71ee6df3..340895244bea 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -278,7 +278,7 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const ::rtl::OUStrin } // anonymous namespace -static __FAR_DATA SvXMLEnumMapEntry aXMLLegendAlignmentMap[] = +static SvXMLEnumMapEntry aXMLLegendAlignmentMap[] = { // { XML_LEFT, chart::ChartLegendPosition_LEFT }, // #i35421# diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 7fe48082cf8a..4ce250e9982b 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -220,7 +220,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap() { if( ! mpChartDocElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] = + static SvXMLTokenMapEntry aDocElemTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, @@ -239,7 +239,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap() { if( ! mpTableElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = + static SvXMLTokenMapEntry aTableElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS }, @@ -260,7 +260,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap() { if( ! mpChartElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aChartElemTokenMap[] = + static SvXMLTokenMapEntry aChartElemTokenMap[] = { { XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA }, { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE }, @@ -280,7 +280,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap() { if( ! mpPlotAreaElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aPlotAreaElemTokenMap[] = + static SvXMLTokenMapEntry aPlotAreaElemTokenMap[] = { { XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT }, { XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION }, @@ -305,7 +305,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap() { if( ! mpSeriesElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aSeriesElemTokenMap[] = + static SvXMLTokenMapEntry aSeriesElemTokenMap[] = { { XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT }, { XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN }, @@ -325,7 +325,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAxisElemTokenMap() { if( ! mpAxisElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aAxisElemTokenMap[] = + static SvXMLTokenMapEntry aAxisElemTokenMap[] = { { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_AXIS_TITLE }, { XML_NAMESPACE_CHART, XML_CATEGORIES, XML_TOK_AXIS_CATEGORIES }, @@ -345,7 +345,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap() { if( ! mpChartAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aChartAttrTokenMap[] = + static SvXMLTokenMapEntry aChartAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF }, { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS }, @@ -367,7 +367,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap() { if( ! mpPlotAreaAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] = + static SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y }, @@ -400,7 +400,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAxisAttrTokenMap() { if( ! mpAxisAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aAxisAttrTokenMap[] = + static SvXMLTokenMapEntry aAxisAttrTokenMap[] = { { XML_NAMESPACE_CHART, XML_DIMENSION, XML_TOK_AXIS_DIMENSION }, { XML_NAMESPACE_CHART, XML_NAME, XML_TOK_AXIS_NAME }, @@ -418,7 +418,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetLegendAttrTokenMap() { if( ! mpLegendAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aLegendAttrTokenMap[] = + static SvXMLTokenMapEntry aLegendAttrTokenMap[] = { { XML_NAMESPACE_CHART, XML_LEGEND_POSITION, XML_TOK_LEGEND_POSITION }, { XML_NAMESPACE_SVG, XML_X, XML_TOK_LEGEND_X }, @@ -437,7 +437,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap() { if( ! mpAutoStyleAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] = + static SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_FAMILY, XML_TOK_AS_FAMILY }, { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_AS_NAME }, @@ -454,7 +454,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap() { if( ! mpCellAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aCellAttrTokenMap[] = + static SvXMLTokenMapEntry aCellAttrTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE }, { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE }, @@ -471,7 +471,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap() { if( ! mpSeriesAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aSeriesAttrTokenMap[] = + static SvXMLTokenMapEntry aSeriesAttrTokenMap[] = { { XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE }, { XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS }, @@ -491,7 +491,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap() { if( ! mpRegEquationAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] = + static SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] = { { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME }, { XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION }, diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index f3001a65762a..b2943c5411b3 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -85,7 +85,7 @@ using namespace ::xmloff::token; using ::rtl::OUString; using com::sun::star::uno::Reference; -static __FAR_DATA SvXMLEnumMapEntry aXMLAxisClassMap[] = +static SvXMLEnumMapEntry aXMLAxisClassMap[] = { { XML_X, SCH_XML_AXIS_X }, { XML_Y, SCH_XML_AXIS_Y }, diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 73f0871a09f7..73e2135535b0 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -40,7 +40,6 @@ #include <xmloff/xmluconv.hxx> // header for struct SvXMLEnumMapEntry #include <xmloff/xmlement.hxx> -// header for define __FAR_DATA #include <tools/solar.h> // header for class SvXMLImportPropertyMapper @@ -164,7 +163,7 @@ Reference< chart2::data::XDataSequence > lcl_createNewSequenceFromCachedXMLRange namespace SchXMLTools { -static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] = +static SvXMLEnumMapEntry aXMLChartClassMap[] = { { XML_LINE, XML_CHART_CLASS_LINE }, { XML_AREA, XML_CHART_CLASS_AREA }, diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index 0489f122679e..564f7b18a717 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -50,7 +50,7 @@ enum SvXMLTokenMapAttrs XML_TOK_SYMBOL_IMAGE_END = XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = +static SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = { { XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF }, { XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE }, diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 40d03b3379b9..2e2635d0edb3 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -88,7 +88,7 @@ enum XMLImageMapToken XML_TOK_IMAP_TARGET }; -static __FAR_DATA SvXMLTokenMapEntry aImageMapObjectTokenMap[] = +static SvXMLTokenMapEntry aImageMapObjectTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAP_URL }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_IMAP_NAME }, diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index a202e39338ed..2c582790c833 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -166,7 +166,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap() { if( mpAnimationNodeTokenMap == NULL ) { - static __FAR_DATA SvXMLTokenMapEntry aAnimationNodeTokenMap[] = + static SvXMLTokenMapEntry aAnimationNodeTokenMap[] = { { XML_NAMESPACE_ANIMATION, XML_PAR, (sal_uInt16)AnimationNodeType::PAR }, { XML_NAMESPACE_ANIMATION, XML_SEQ, (sal_uInt16)AnimationNodeType::SEQ }, @@ -245,7 +245,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM { if( mpAnimationNodeAttributeTokenMap == NULL ) { - static __FAR_DATA SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] = + static SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] = { { XML_NAMESPACE_SMIL, XML_BEGIN, (sal_uInt16)ANA_Begin }, { XML_NAMESPACE_SMIL, XML_DUR, (sal_uInt16)ANA_Dur }, diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 335a5aa3947d..83734c303354 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -502,7 +502,7 @@ const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap() { if(!mpDocElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aDocElemTokenMap[] = + static SvXMLTokenMapEntry aDocElemTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, @@ -527,7 +527,7 @@ const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap() { if(!mpBodyElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aBodyElemTokenMap[] = + static SvXMLTokenMapEntry aBodyElemTokenMap[] = { { XML_NAMESPACE_DRAW, XML_PAGE, XML_TOK_BODY_PAGE }, { XML_NAMESPACE_PRESENTATION, XML_SETTINGS, XML_TOK_BODY_SETTINGS }, @@ -550,7 +550,7 @@ const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap() { if(!mpStylesElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aStylesElemTokenMap[] = + static SvXMLTokenMapEntry aStylesElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLES_PAGE_MASTER }, { XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, XML_TOK_STYLES_PRESENTATION_PAGE_LAYOUT }, @@ -570,7 +570,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap() { if(!mpMasterPageElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aMasterPageElemTokenMap[] = + static SvXMLTokenMapEntry aMasterPageElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_MASTERPAGE_STYLE }, { XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_MASTERPAGE_NOTES }, @@ -589,7 +589,7 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap() { if(!mpMasterPageAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aMasterPageAttrTokenMap[] = + static SvXMLTokenMapEntry aMasterPageAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_MASTERPAGE_NAME }, { XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, XML_TOK_MASTERPAGE_DISPLAY_NAME }, @@ -614,7 +614,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap() { if(!mpPageMasterAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aPageMasterAttrTokenMap[] = + static SvXMLTokenMapEntry aPageMasterAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_PAGEMASTER_NAME }, XML_TOKEN_MAP_END @@ -632,7 +632,7 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap() { if(!mpPageMasterStyleAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] = + static SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] = { { XML_NAMESPACE_FO, XML_MARGIN_TOP, XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP }, { XML_NAMESPACE_FO, XML_MARGIN_BOTTOM, XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM }, @@ -656,7 +656,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap() { if(!mpDrawPageAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aDrawPageAttrTokenMap[] = + static SvXMLTokenMapEntry aDrawPageAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DRAWPAGE_NAME }, { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_DRAWPAGE_STYLE_NAME }, @@ -684,7 +684,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap() { if(!mpDrawPageElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aDrawPageElemTokenMap[] = + static SvXMLTokenMapEntry aDrawPageElemTokenMap[] = { { XML_NAMESPACE_PRESENTATION, XML_NOTES, XML_TOK_DRAWPAGE_NOTES }, { XML_NAMESPACE_ANIMATION, XML_PAR, XML_TOK_DRAWPAGE_PAR }, @@ -704,7 +704,7 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap() { if(!mpPresentationPlaceholderAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] = + static SvXMLTokenMapEntry aPresentationPlaceholderAttrTokenMap[] = { { XML_NAMESPACE_PRESENTATION, XML_OBJECT, XML_TOK_PRESENTATIONPLACEHOLDER_OBJECTNAME }, { XML_NAMESPACE_SVG, XML_X, XML_TOK_PRESENTATIONPLACEHOLDER_X }, diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 0caa6d361ffe..1df4675e7bd8 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -275,7 +275,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap() { if(!mpGroupShapeElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aGroupShapeElemTokenMap[] = + static SvXMLTokenMapEntry aGroupShapeElemTokenMap[] = { { XML_NAMESPACE_DRAW, XML_G, XML_TOK_GROUP_GROUP }, { XML_NAMESPACE_DRAW, XML_RECT, XML_TOK_GROUP_RECT }, @@ -315,7 +315,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap() { if(!mpFrameShapeElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aFrameShapeElemTokenMap[] = + static SvXMLTokenMapEntry aFrameShapeElemTokenMap[] = { { XML_NAMESPACE_DRAW, XML_TEXT_BOX, XML_TOK_FRAME_TEXT_BOX }, { XML_NAMESPACE_DRAW, XML_IMAGE, XML_TOK_FRAME_IMAGE }, @@ -341,7 +341,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() { if(!mp3DSceneShapeElemTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] = + static SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] = { { XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_3DSCENE_3DSCENE }, { XML_NAMESPACE_DR3D, XML_CUBE, XML_TOK_3DSCENE_3DCUBE }, @@ -364,7 +364,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetShapeAttrTokenMap() { if(!mpShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aShapeAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_SHAPE_NAME }, { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_SHAPE_DRAWSTYLE_NAME_GRAPHICS }, @@ -389,7 +389,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap() { if(!mp3DObjectAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DObjectAttrTokenMap[] = + static SvXMLTokenMapEntry a3DObjectAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_3DOBJECT_DRAWSTYLE_NAME }, { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DOBJECT_TRANSFORM }, @@ -409,7 +409,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap() { if(!mp3DPolygonBasedAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] = + static SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_3DPOLYGONBASED_VIEWBOX }, { XML_NAMESPACE_SVG, XML_D, XML_TOK_3DPOLYGONBASED_D }, @@ -429,7 +429,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap() { if(!mp3DCubeObjectAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] = + static SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] = { { XML_NAMESPACE_DR3D, XML_MIN_EDGE, XML_TOK_3DCUBEOBJ_MINEDGE }, { XML_NAMESPACE_DR3D, XML_MAX_EDGE, XML_TOK_3DCUBEOBJ_MAXEDGE }, @@ -449,7 +449,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() { if(!mp3DSphereObjectAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] = + static SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] = { { XML_NAMESPACE_DR3D, XML_CENTER, XML_TOK_3DSPHEREOBJ_CENTER }, { XML_NAMESPACE_DR3D, XML_SIZE, XML_TOK_3DSPHEREOBJ_SIZE }, @@ -469,7 +469,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetRectShapeAttrTokenMap() { if(!mpRectShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aRectShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aRectShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X, XML_TOK_RECTSHAPE_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_RECTSHAPE_Y }, @@ -492,7 +492,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetLineShapeAttrTokenMap() { if(!mpLineShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aLineShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aLineShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X1, XML_TOK_LINESHAPE_X1 }, { XML_NAMESPACE_SVG, XML_Y1, XML_TOK_LINESHAPE_Y1 }, @@ -514,7 +514,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetEllipseShapeAttrTokenMap() { if(!mpEllipseShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aEllipseShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_RX, XML_TOK_ELLIPSESHAPE_RX }, { XML_NAMESPACE_SVG, XML_RY, XML_TOK_ELLIPSESHAPE_RY }, @@ -537,7 +537,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap() { if(!mpPolygonShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_POLYGONSHAPE_VIEWBOX }, { XML_NAMESPACE_DRAW, XML_POINTS, XML_TOK_POLYGONSHAPE_POINTS }, @@ -557,7 +557,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap() { if(!mpPathShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aPathShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aPathShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_PATHSHAPE_VIEWBOX }, { XML_NAMESPACE_SVG, XML_D, XML_TOK_PATHSHAPE_D }, @@ -577,7 +577,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetTextBoxShapeAttrTokenMap() { if(!mpTextBoxShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aTextBoxShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X, XML_TOK_TEXTBOXSHAPE_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TEXTBOXSHAPE_Y }, @@ -599,7 +599,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetControlShapeAttrTokenMap() { if(!mpControlShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aControlShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aControlShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X, XML_TOK_CONTROLSHAPE_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_CONTROLSHAPE_Y }, @@ -621,7 +621,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap() { if(!mp3DSceneShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] = + static SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] = { { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DSCENESHAPE_TRANSFORM }, { XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_3DSCENESHAPE_VRP }, @@ -650,7 +650,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() { if(!mp3DLightAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry a3DLightAttrTokenMap[] = + static SvXMLTokenMapEntry a3DLightAttrTokenMap[] = { { XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TOK_3DLIGHT_DIFFUSE_COLOR }, { XML_NAMESPACE_DR3D, XML_DIRECTION, XML_TOK_3DLIGHT_DIRECTION }, @@ -672,7 +672,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetPageShapeAttrTokenMap() { if(!mpPageShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aPageShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aPageShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X, XML_TOK_PAGESHAPE_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PAGESHAPE_Y }, @@ -694,7 +694,7 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetGraphicObjectShapeAttrTokenMap() { if(!mpGraphicObjectShapeAttrTokenMap) { - static __FAR_DATA SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] = + static SvXMLTokenMapEntry aGraphicObjectShapeAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_X, XML_TOK_GOSHAPE_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_GOSHAPE_Y }, diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 351a3ad8130d..ef1d86774a0e 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -52,7 +52,7 @@ using ::rtl::OUString; // ------------------------------------------------------------------------ -sal_Char __FAR_DATA XMLN_VERSIONSLIST[] = "VersionList.xml"; +sal_Char XMLN_VERSIONSLIST[] = "VersionList.xml"; // ------------------------------------------------------------------------ diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index a2aeda726cc9..356348830b9e 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs XML_TOK_DASH_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = +static SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME }, diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 1584479ba7eb..e4b1492fd042 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -112,7 +112,7 @@ sal_Bool XMLGradientStyleImport::importXML( aGradient.Border = 0; { - static __FAR_DATA SvXMLTokenMapEntry aGradientAttrTokenMap[] = + static SvXMLTokenMapEntry aGradientAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME }, diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index fdd78e7184c7..0c086d573e4a 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -101,7 +101,7 @@ sal_Bool XMLHatchStyleImport::importXML( aHatch.Angle = 0; { - static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] = + static SvXMLTokenMapEntry aHatchAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_HATCH_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_HATCH_DISPLAY_NAME }, diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index e2de2beaefbc..938b753702f2 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -152,7 +152,7 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute OUString aDisplayName; { - static __FAR_DATA SvXMLTokenMapEntry aHatchAttrTokenMap[] = + static SvXMLTokenMapEntry aHatchAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME }, diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index f19a10fb27bf..95ed1d56a9b4 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -107,7 +107,7 @@ sal_Bool XMLTransGradientStyleImport::importXML( aGradient.Border = 0; { - static __FAR_DATA SvXMLTokenMapEntry aTrGradientAttrTokenMap[] = + static SvXMLTokenMapEntry aTrGradientAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_GRADIENT_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_GRADIENT_DISPLAY_NAME }, diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index e69b96f55a94..2af2991d2b34 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs }; const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = + static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index c34183ee84c5..27dfb317b654 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -71,7 +71,7 @@ enum XMLFontStyleAttrTokens const SvXMLTokenMapEntry* lcl_getFontStyleAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aFontStyleAttrTokenMap[] = + static SvXMLTokenMapEntry aFontStyleAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_FONT_FAMILY, XML_TOK_FONT_STYLE_ATTR_FAMILY }, diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 93c68f4b46cb..d10251acd2f0 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -334,14 +334,14 @@ static ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] = // maps for SvXMLUnitConverter::convertEnum -static __FAR_DATA SvXMLEnumMapEntry aStyleValueMap[] = +static SvXMLEnumMapEntry aStyleValueMap[] = { { XML_SHORT, sal_False }, { XML_LONG, sal_True }, { XML_TOKEN_INVALID, 0 } }; -static __FAR_DATA SvXMLEnumMapEntry aFormatSourceMap[] = +static SvXMLEnumMapEntry aFormatSourceMap[] = { { XML_FIXED, sal_False }, { XML_LANGUAGE, sal_True }, @@ -363,7 +363,7 @@ struct SvXMLDefaultDateFormat sal_Bool bSystem; }; -static __FAR_DATA SvXMLDefaultDateFormat aDefaultDateFormats[] = +static SvXMLDefaultDateFormat aDefaultDateFormats[] = { // format day-of-week day month year hours minutes seconds format-source @@ -504,7 +504,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStylesElemTokenMap() { if( !pStylesElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aStylesElemMap[] = + static SvXMLTokenMapEntry aStylesElemMap[] = { // style elements { XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE, XML_TOK_STYLES_NUMBER_STYLE }, @@ -526,7 +526,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap() { if( !pStyleElemTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aStyleElemMap[] = + static SvXMLTokenMapEntry aStyleElemMap[] = { // elements in a style { XML_NAMESPACE_NUMBER, XML_TEXT, XML_TOK_STYLE_TEXT }, @@ -561,7 +561,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleAttrTokenMap() { if( !pStyleAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aStyleAttrMap[] = + static SvXMLTokenMapEntry aStyleAttrMap[] = { // attributes for a style { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_STYLE_ATTR_NAME }, @@ -588,7 +588,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap() { if( !pStyleElemAttrTokenMap ) { - static __FAR_DATA SvXMLTokenMapEntry aStyleElemAttrMap[] = + static SvXMLTokenMapEntry aStyleElemAttrMap[] = { // attributes for an element within a style { XML_NAMESPACE_NUMBER, XML_DECIMAL_PLACES, XML_TOK_ELEM_ATTR_DECIMAL_PLACES }, diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 9fbd84ea7cd9..9cde639c9c81 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -175,7 +175,7 @@ enum SvxXMLTextListLevelStyleAttrTokens const SvXMLTokenMapEntry* lcl_getLevelAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aLevelAttrTokenMap[] = + static SvXMLTokenMapEntry aLevelAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_LEVEL_ATTR_LEVEL }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME }, @@ -679,7 +679,7 @@ enum SvxXMLStyleAttributesAttrTokens }; const SvXMLTokenMapEntry* lcl_getStyleAttributesAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = + static SvXMLTokenMapEntry aStyleAttributesAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_SPACE_BEFORE, XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE }, @@ -1001,7 +1001,7 @@ enum SvxXMLStyleAttributesLabelAlignmentAttrTokens }; const SvXMLTokenMapEntry* lcl_getStyleAlignmentAttributesAttrTokenMap() { - static __FAR_DATA SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] = + static SvXMLTokenMapEntry aStyleAlignmentAttributesAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_LABEL_FOLLOWED_BY, XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY }, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 971845293efc..c4c862e134e1 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -77,7 +77,7 @@ using namespace ::xmloff::token; // --------------------------------------------------------------------- -static __FAR_DATA SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = +static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE }, { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER }, diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 6cf1f42718b3..338e1018ca80 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -62,7 +62,7 @@ enum SvXMLTokenMapAttrs XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = +static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION }, { XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE }, diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index c98f6e1fe25a..448f0ab233c3 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -196,7 +196,7 @@ enum XMLFtnConfigToken XML_TOK_FTNCONFIG_POSITION }; -static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = +static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, XML_TOK_FTNCONFIG_CITATION_STYLENAME }, { XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME }, diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 85e988f8506c..05d4b82759a3 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -71,7 +71,7 @@ enum XMLFootnoteChildToken { XML_TOK_FTN_NOTE_BODY }; -static __FAR_DATA SvXMLTokenMapEntry aFootnoteChildTokenMap[] = +static SvXMLTokenMapEntry aFootnoteChildTokenMap[] = { { XML_NAMESPACE_TEXT, XML_NOTE_CITATION, XML_TOK_FTN_NOTE_CITATION }, diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index 9e318a9be2db..6f1f382d45a8 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -59,7 +59,7 @@ using ::com::sun::star::xml::sax::XAttributeList; const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter"; const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops"; -static __FAR_DATA SvXMLTokenMapEntry aIndexSourceTokenMap[] = +static SvXMLTokenMapEntry aIndexSourceTokenMap[] = { { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 5f3f8cac7485..719a6da77031 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -81,7 +81,7 @@ enum XMLSectionToken XML_TOK_SECTION_IS_HIDDEN }; -static __FAR_DATA SvXMLTokenMapEntry aSectionTokenMap[] = +static SvXMLTokenMapEntry aSectionTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_SECTION_XMLID }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME }, diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index 308eac06f7ee..d5c5afecd468 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -87,7 +87,7 @@ enum XMLSectionSourceDDEToken XML_TOK_SECTION_IS_AUTOMATIC_UPDATE }; -static __FAR_DATA SvXMLTokenMapEntry aSectionSourceDDETokenMap[] = +static SvXMLTokenMapEntry aSectionSourceDDETokenMap[] = { { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_SECTION_DDE_APPLICATION }, diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 5a6fd6a57df8..1fca85752fda 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -74,7 +74,7 @@ enum XMLSectionSourceToken XML_TOK_SECTION_TEXT_SECTION_NAME }; -static __FAR_DATA SvXMLTokenMapEntry aSectionSourceTokenMap[] = +static SvXMLTokenMapEntry aSectionSourceTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF }, { XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME }, diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 55559c1b4f50..676ed31313e1 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -71,7 +71,7 @@ enum SvXMLSepTokenMapAttrs XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] = +static SvXMLTokenMapEntry aColAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH }, { XML_NAMESPACE_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT }, @@ -79,7 +79,7 @@ static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aColSepAttrTokenMap[] = +static SvXMLTokenMapEntry aColSepAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH }, { XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR }, diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index 56d8cd3ac52b..e72b35faed41 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -55,7 +55,7 @@ enum SvXMLTokenMapDropAttrs XML_TOK_DROP_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aDropAttrTokenMap[] = +static SvXMLTokenMapEntry aDropAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_LINES, XML_TOK_DROP_LINES }, { XML_NAMESPACE_STYLE, XML_LENGTH, XML_TOK_DROP_LENGTH }, diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index bead9ab149b8..3f713a49c14e 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3009,7 +3009,7 @@ enum DdeFieldDeclAttrs XML_TOK_DDEFIELD_UPDATE }; -static __FAR_DATA SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = +static SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME }, { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION }, diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index ada788291401..8fb0130edf17 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -121,7 +121,7 @@ using ::comphelper::UStringLess; -static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] = +static SvXMLTokenMapEntry aTextElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TEXT_P }, { XML_NAMESPACE_TEXT, XML_H, XML_TOK_TEXT_H }, @@ -157,7 +157,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] = +static SvXMLTokenMapEntry aTextPElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN }, { XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP }, @@ -333,7 +333,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] = +static SvXMLTokenMapEntry aTextPAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID }, { XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT }, @@ -351,7 +351,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = +static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID }, { XML_NAMESPACE_TEXT, XML_LIST_ID, @@ -366,7 +366,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = +static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, @@ -378,14 +378,14 @@ static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextListBlockElemTokenMap[] = +static SvXMLTokenMapEntry aTextListBlockElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER }, { XML_NAMESPACE_TEXT, XML_LIST_ITEM, XML_TOK_TEXT_LIST_ITEM }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = +static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME }, { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME }, @@ -417,7 +417,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] = +static SvXMLTokenMapEntry aTextContourAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH }, { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT }, @@ -428,7 +428,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = +static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME }, @@ -440,7 +440,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = +static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER }, { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER }, @@ -450,7 +450,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = +static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED }, { XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXTFIELD_DESCRIPTION }, diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index cffc6a7fa5ed..589c3a1d69ee 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star::container; //using namespace ::com::sun::star::text; using namespace ::xmloff::token; -static __FAR_DATA SvXMLEnumMapEntry aCategoryMap[] = +static SvXMLEnumMapEntry aCategoryMap[] = { { XML_TEXT, ParagraphStyleCategory::TEXT }, { XML_CHAPTER, ParagraphStyleCategory::CHAPTER }, |