[Libreoffice-commits] .: 3 commits - binfilter/bf_basic binfilter/bf_sc binfilter/bf_svtools binfilter/bf_sw binfilter/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 16 14:09:50 PST 2011
binfilter/bf_basic/source/inc/opcodes.hxx | 4 ----
binfilter/bf_sc/source/core/tool/sc_callform.cxx | 10 ----------
binfilter/bf_svtools/source/svdde/ddeimp.hxx | 2 +-
binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx | 2 +-
binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx | 2 +-
binfilter/bf_sw/source/core/doc/sw_swtable.cxx | 4 ----
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 3 ---
binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx | 3 ---
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 2 +-
binfilter/bf_sw/source/filter/excel/excvfbff.hxx | 5 ++---
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 2 +-
binfilter/inc/bf_svtools/svarray.hxx | 2 +-
12 files changed, 8 insertions(+), 33 deletions(-)
New commits:
commit 94e4a1d728110fe20618bff1014848bcbe5079fb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 23:05:26 2011 +0100
Remove BLC support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"BLC - borland compiler (OS2, win16) - obsolete"
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index d65cb26..a9f0c2a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -76,15 +76,6 @@ typedef void (CALLTYPE* FARPROC) ( void );
}
-#if defined(OS2) && defined(BLC)
-#define GETFUNCTIONCOUNT "_GetFunctionCount"
-#define GETFUNCTIONDATA "_GetFunctionData"
-#define SETLANGUAGE "_SetLanguage"
-#define GETPARAMDESC "_GetParameterDescription"
-#define ISASYNC "_IsAsync"
-#define ADVICE "_Advice"
-#define UNADVICE "_Unadvice"
-#else // Pascal oder extern "C"
#define GETFUNCTIONCOUNT "GetFunctionCount"
#define GETFUNCTIONDATA "GetFunctionData"
#define SETLANGUAGE "SetLanguage"
@@ -92,7 +83,6 @@ typedef void (CALLTYPE* FARPROC) ( void );
#define ISASYNC "IsAsync"
#define ADVICE "Advice"
#define UNADVICE "Unadvice"
-#endif
#define LIBFUNCNAME( name ) \
(String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( name ) ))
diff --git a/binfilter/bf_sw/source/filter/excel/excvfbff.hxx b/binfilter/bf_sw/source/filter/excel/excvfbff.hxx
index 8b89093..dbf85c4 100644
--- a/binfilter/bf_sw/source/filter/excel/excvfbff.hxx
+++ b/binfilter/bf_sw/source/filter/excel/excvfbff.hxx
@@ -36,8 +36,7 @@ namespace binfilter {
class ValueFormBuffer;
-#if defined(BLC) || defined(MAC)
-// BLC will es auf jeden Fall hier
+#if defined(MAC)
typedef void ( ValueFormBuffer::*Fkt_rString )( String & );
typedef sal_uInt32 ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
#endif
@@ -45,7 +44,7 @@ typedef sal_uInt32 ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
class ValueFormBuffer
{
private:
-#if !defined(BLC) && !defined(MAC)
+#if !defined(MAC)
// MSC will es auf jeden Fall hier
typedef void ( ValueFormBuffer::*Fkt_rString )( String & );
typedef sal_uInt32 ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
commit e8d4b25163267561660c314d7d4af50bf712f034
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 22:54:58 2011 +0100
Remove WTC support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"WTC - watcom compiler (OS2, WNT?) - obsolete"
diff --git a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
index 57f6822..51447c0 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
@@ -31,10 +31,6 @@
#pragma hdrstop
#endif
-#ifdef WTC
-#define private public
-#endif
-
#include <ctype.h>
#include <float.h>
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 154dcd4..f9103a9 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -32,9 +32,6 @@
#endif
#define ITEMID_BOXINFO SID_ATTR_BORDER_INNER
-#ifdef WTC
-#define private public
-#endif
#include <hintids.hxx>
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
index 8f9e41d..ed250ae 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx
@@ -32,9 +32,6 @@
#endif
#define ITEMID_BOXINFO SID_ATTR_BORDER_INNER
-#ifdef WTC
-#define private public
-#endif
#include "hintids.hxx"
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 7a5f95c..d18cd77 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -69,7 +69,7 @@
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
-#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(WTC) && !defined(__MINGW32__) && !defined(OS2)
+#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MINGW32__) && !defined(OS2)
#define FIELDFNTAB_SIZE 37
#if FIELDFNTAB_SIZE != RES_FIELDS_END - RES_FIELDS_BEGIN
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
index c37b11d..151a9ff 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
@@ -95,7 +95,7 @@ namespace binfilter {
* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
*/
-#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(WTC) && !defined(__MINGW32__) && !defined(OS2)
+#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MINGW32__) && !defined(OS2)
#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index 689fe5a..4775034 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -936,7 +936,7 @@ public:\
#define C40_PTR_REPLACE( c, p) Replace( (c const *) p )
#define C40_GETPOS( c, r) GetPos( (c const *)r )
#else
-#if defined WTC || defined ICC|| (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
+#if defined ICC|| (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
#define C40_PUSH( c, p) Push( (c const *&) p )
#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
commit 39cf1aafc98e090c43402027bdf8d86e28867b51
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 16 22:43:05 2011 +0100
Remove MTW support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"MTW - metrowerks compiler (mac OS9 ?) - obsolete"
diff --git a/binfilter/bf_basic/source/inc/opcodes.hxx b/binfilter/bf_basic/source/inc/opcodes.hxx
index a670ed0..ffa20b3 100644
--- a/binfilter/bf_basic/source/inc/opcodes.hxx
+++ b/binfilter/bf_basic/source/inc/opcodes.hxx
@@ -31,10 +31,6 @@
#include "sbintern.hxx"
-#ifdef MTW
-#undef _NUMBER
-#endif
-
// Ein Opcode ist entweder 1, 3 oder 5 Bytes lang, je nach numerischen
// Wert des Opcodes (s.u.).
diff --git a/binfilter/bf_svtools/source/svdde/ddeimp.hxx b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
index 2aa1262..e6256d6 100644
--- a/binfilter/bf_svtools/source/svdde/ddeimp.hxx
+++ b/binfilter/bf_svtools/source/svdde/ddeimp.hxx
@@ -77,7 +77,7 @@ public:
static HDDEDATA CALLBACK InfCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
#else
-#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
+#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
static HDDEDATA CALLBACK CliCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
static HDDEDATA CALLBACK SvrCallback
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx b/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx
index c7c49a3..e6be5d6 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddeinf.cxx
@@ -44,7 +44,7 @@ namespace binfilter
HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
#else
-#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
+#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
#else
diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index e8ea3c6..287a732 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -70,7 +70,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
#else
-#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
+#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
More information about the Libreoffice-commits
mailing list