[Libreoffice-commits] .: dbaccess/source reportdesign/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Dec 6 02:34:54 PST 2010
dbaccess/source/filter/xml/xmlfilter.cxx | 20 ++++++++++----------
dbaccess/source/ui/inc/TokenWriter.hxx | 6 +++---
dbaccess/source/ui/misc/TokenWriter.cxx | 16 ++++++++--------
reportdesign/source/filter/xml/xmlHelper.cxx | 4 ++--
reportdesign/source/filter/xml/xmlfilter.cxx | 22 +++++++++++-----------
5 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit b40db1ccd387c9818b5685754f6539ea0a942cb2
Author: Michael Callahan <callahan at xmission.com>
Date: Mon Dec 6 10:35:08 2010 +0000
remove obsolete __FAR_DATA
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a373e8f..1fc2c05 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -607,7 +607,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
{
if ( !m_pDocElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
{ XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
@@ -629,7 +629,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
{
if ( !m_pDatabaseElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE },
{ XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS},
@@ -649,7 +649,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
{
if ( !m_pDataSourceElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE},
{ XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS},
@@ -700,7 +700,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
{
if ( !m_pLoginElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME},
{ XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED},
@@ -717,7 +717,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
{
if ( !m_pDatabaseDescriptionElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE},
{ XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE},
@@ -732,7 +732,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
{
if ( !m_pDataSourceInfoElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT},
{ XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT},
@@ -758,7 +758,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
{
if ( !m_pDocumentsElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT},
{ XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION},
@@ -778,7 +778,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
{
if ( !m_pComponentElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE },
@@ -797,7 +797,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
{
if ( !m_pQueryElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND },
{ XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING },
@@ -821,7 +821,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
{
if ( !m_pColumnElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME },
{ XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME },
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 43952c9..702d570 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -93,9 +93,9 @@ namespace dbaui
bool m_bNeedToReInitialize;
#if defined UNX
- static const char __FAR_DATA sNewLine;
+ static const char sNewLine;
#else
- static const char __FAR_DATA sNewLine[];
+ static const char sNewLine[];
#endif
ODatabaseExport* m_pReader;
@@ -178,7 +178,7 @@ namespace dbaui
// HtmlFontSz[1-7] in s*3.ini [user]
static sal_Int16 nFontSize[SBA_HTML_FONTSIZES];
static const sal_Int16 nCellSpacing;
- static const char __FAR_DATA sIndentSource[];
+ static const char sIndentSource[];
char sIndent[nIndentMax+1];
sal_Int16 m_nIndent;
#ifdef DBG_UTIL
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index a92f474..79c112b 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -82,15 +82,15 @@ using namespace ::com::sun::star::util;
using ::com::sun::star::frame::XModel;
#if defined(UNX)
-const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012';
+const char ODatabaseImportExport::sNewLine = '\012';
#else
-const char __FAR_DATA ODatabaseImportExport::sNewLine[] = "\015\012";
+const char ODatabaseImportExport::sNewLine[] = "\015\012";
#endif
-const static char __FAR_DATA sMyBegComment[] = "<!-- ";
-const static char __FAR_DATA sMyEndComment[] = " -->";
-const static char __FAR_DATA sFontFamily[] = "font-family: ";
-const static char __FAR_DATA sFontSize[] = "font-size: ";
+const static char sMyBegComment[] = "<!-- ";
+const static char sMyEndComment[] = " -->";
+const static char sFontFamily[] = "font-family: ";
+const static char sFontSize[] = "font-size: ";
#define SBA_FORMAT_SELECTION_COUNT 4
#define CELL_X 1437
@@ -660,7 +660,7 @@ BOOL ORTFImportExport::Read()
}
//-------------------------------------------------------------------
//===================================================================
-const sal_Int16 __FAR_DATA OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] =
+const sal_Int16 OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] =
{
HTMLFONTSZ1_DFLT, HTMLFONTSZ2_DFLT, HTMLFONTSZ3_DFLT, HTMLFONTSZ4_DFLT,
HTMLFONTSZ5_DFLT, HTMLFONTSZ6_DFLT, HTMLFONTSZ7_DFLT
@@ -669,7 +669,7 @@ const sal_Int16 __FAR_DATA OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZE
sal_Int16 OHTMLImportExport::nFontSize[SBA_HTML_FONTSIZES] = { 0 };
const sal_Int16 OHTMLImportExport::nCellSpacing = 0;
-const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
//========================================================================
// Macros for HTML-Export
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 89f9b6b..edcc09e 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -350,7 +350,7 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
// -----------------------------------------------------------------------------
SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_REPORT_HEADER, XML_TOK_REPORT_HEADER },
{ XML_NAMESPACE_REPORT, XML_PAGE_HEADER , XML_TOK_PAGE_HEADER },
@@ -377,7 +377,7 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
// -----------------------------------------------------------------------------
SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap()
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, XML_TOK_MASTER_DETAIL_FIELD},
{ XML_NAMESPACE_REPORT, XML_MASTER, XML_TOK_MASTER},
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 7038b9c..67e43e7 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -741,7 +741,7 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
{
if ( !m_pDocElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
{ XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
@@ -776,7 +776,7 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
{
if ( !m_pFunctionElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME },
{ XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA},
@@ -794,7 +794,7 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
{
if ( !m_pFormatElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED },
{ XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA },
@@ -810,7 +810,7 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
{
if ( !m_pGroupElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN },
{ XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER },
@@ -835,7 +835,7 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
{
if ( !m_pElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES },
{ XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE },
@@ -853,7 +853,7 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
{
if ( !m_pControlElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL },
{ XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES },
@@ -875,7 +875,7 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
{
if ( !m_pControlElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME },
{ XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE },
@@ -897,7 +897,7 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
{
if ( !m_pComponentElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME },
{ XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME },
@@ -913,7 +913,7 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
{
if ( !m_pColumnTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME },
{ XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME },
@@ -937,7 +937,7 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
{
if ( !m_pSectionElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE },
{ XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME },
@@ -960,7 +960,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
{
if ( !m_pCellElemTokenMap.get() )
{
- static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
+ static SvXMLTokenMapEntry aElemTokenMap[]=
{
{ XML_NAMESPACE_TEXT, XML_P , XML_TOK_P },
{ XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT },
More information about the Libreoffice-commits
mailing list