remove obsolete __FAR_DATAfeature/currency-64bit

3 files changed, 21 insertions, 21 deletions

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a373e8f64..1fc2c054b 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -607,7 +607,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
 {
     if ( !m_pDocElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_OFFICE, XML_SETTINGS,			XML_TOK_DOC_SETTINGS	},
             { XML_NAMESPACE_OOO,    XML_SETTINGS,			XML_TOK_DOC_SETTINGS	},
@@ -629,7 +629,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
 {
     if ( !m_pDatabaseElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_DATASOURCE,	            XML_TOK_DATASOURCE	},
             { XML_NAMESPACE_DB,	XML_FORMS,		            XML_TOK_FORMS},
@@ -649,7 +649,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
 {
     if ( !m_pDataSourceElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	    XML_CONNECTION_RESOURCE,			XML_TOK_CONNECTION_RESOURCE},
             { XML_NAMESPACE_DB,	    XML_SUPPRESS_VERSION_COLUMNS,		XML_TOK_SUPPRESS_VERSION_COLUMNS},
@@ -700,7 +700,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
 {
     if ( !m_pLoginElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_USER_NAME,				XML_TOK_USER_NAME},
             { XML_NAMESPACE_DB,	XML_IS_PASSWORD_REQUIRED,	XML_TOK_IS_PASSWORD_REQUIRED},
@@ -717,7 +717,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
 {
     if ( !m_pDatabaseDescriptionElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_FILE_BASED_DATABASE,	XML_TOK_FILE_BASED_DATABASE},
             { XML_NAMESPACE_DB,	XML_SERVER_DATABASE,	    XML_TOK_SERVER_DATABASE},
@@ -732,7 +732,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
 {
     if ( !m_pDataSourceInfoElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT},
             { XML_NAMESPACE_DB,	XML_ROW_RETRIEVING_STATEMENT,	XML_TOK_ROW_RETRIEVING_STATEMENT},
@@ -758,7 +758,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
 {
     if ( !m_pDocumentsElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_COMPONENT,				XML_TOK_COMPONENT},
             { XML_NAMESPACE_DB,	XML_COMPONENT_COLLECTION,	XML_TOK_COMPONENT_COLLECTION},
@@ -778,7 +778,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
 {
     if ( !m_pComponentElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_XLINK,	XML_HREF,			XML_TOK_HREF	},
             { XML_NAMESPACE_XLINK,	XML_TYPE,			XML_TOK_TYPE	},
@@ -797,7 +797,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
 {
     if ( !m_pQueryElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_COMMAND,			XML_TOK_COMMAND	},
             { XML_NAMESPACE_DB,	XML_ESCAPE_PROCESSING,	XML_TOK_ESCAPE_PROCESSING	},
@@ -821,7 +821,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
 {
     if ( !m_pColumnElemTokenMap.get() )
     {
-        static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+        static SvXMLTokenMapEntry aElemTokenMap[]=
         {
             { XML_NAMESPACE_DB,	XML_NAME,			            XML_TOK_COLUMN_NAME	            },
             { XML_NAMESPACE_DB,	XML_STYLE_NAME,		            XML_TOK_COLUMN_STYLE_NAME	    },
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 43952c95f..702d5704c 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -93,9 +93,9 @@ namespace dbaui
         bool            m_bNeedToReInitialize;
 
 #if defined UNX
-        static const char __FAR_DATA sNewLine;
+        static const char sNewLine;
 #else
-        static const char __FAR_DATA sNewLine[];
+        static const char sNewLine[];
 #endif
 
         ODatabaseExport*	m_pReader;
@@ -178,7 +178,7 @@ namespace dbaui
         // HtmlFontSz[1-7] in s*3.ini [user]
         static sal_Int16		nFontSize[SBA_HTML_FONTSIZES];
         static const sal_Int16	nCellSpacing;
-        static const char __FAR_DATA sIndentSource[];
+        static const char sIndentSource[];
         char					sIndent[nIndentMax+1];
         sal_Int16				m_nIndent;
     #ifdef DBG_UTIL
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index a92f47479..79c112bb2 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -82,15 +82,15 @@ using namespace ::com::sun::star::util;
 using ::com::sun::star::frame::XModel;
 
 #if defined(UNX)
-const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012';
+const char ODatabaseImportExport::sNewLine = '\012';
 #else
-const char __FAR_DATA ODatabaseImportExport::sNewLine[] = "\015\012";
+const char ODatabaseImportExport::sNewLine[] = "\015\012";
 #endif
 
-const static char __FAR_DATA sMyBegComment[]	= "<!-- ";
-const static char __FAR_DATA sMyEndComment[]	= " -->";
-const static char __FAR_DATA sFontFamily[]		= "font-family: ";
-const static char __FAR_DATA sFontSize[]		= "font-size: ";
+const static char sMyBegComment[]	= "<!-- ";
+const static char sMyEndComment[]	= " -->";
+const static char sFontFamily[]		= "font-family: ";
+const static char sFontSize[]		= "font-size: ";
 
 #define SBA_FORMAT_SELECTION_COUNT	4
 #define CELL_X                      1437
@@ -660,7 +660,7 @@ BOOL ORTFImportExport::Read()
 }
 //-------------------------------------------------------------------
 //===================================================================
-const sal_Int16 __FAR_DATA OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] =
+const sal_Int16 OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] =
 {
     HTMLFONTSZ1_DFLT, HTMLFONTSZ2_DFLT, HTMLFONTSZ3_DFLT, HTMLFONTSZ4_DFLT,
     HTMLFONTSZ5_DFLT, HTMLFONTSZ6_DFLT, HTMLFONTSZ7_DFLT
@@ -669,7 +669,7 @@ const sal_Int16 __FAR_DATA OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZE
 sal_Int16 OHTMLImportExport::nFontSize[SBA_HTML_FONTSIZES] = { 0 };
 
 const sal_Int16 OHTMLImportExport::nCellSpacing = 0;
-const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
 //========================================================================
 // Macros for HTML-Export