summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--connectivity/source/inc/odbc/OFunctiondefs.hxx50
-rw-r--r--idl/inc/globals.hxx3
-rw-r--r--idl/source/prj/svidl.cxx4
-rw-r--r--sc/source/ui/docshell/docfunc.cxx5
-rw-r--r--svl/source/svdde/ddeimp.hxx18
-rw-r--r--svl/source/svdde/ddeinf.cxx10
-rw-r--r--svl/source/svdde/ddesvr.cxx6
-rw-r--r--vcl/source/filter/jpeg/jpeg.h4
-rw-r--r--vcl/source/window/splitwin.cxx2
-rw-r--r--vcl/win/source/app/salshl.cxx8
10 files changed, 0 insertions, 110 deletions
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 87f4d5492e77..0af1d26470b3 100644
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -52,56 +52,6 @@
//--------------------------------------------------------------------------
-#ifdef OS2__00
-
-#ifdef ODBCIMP
-
-// Stub version: dynamic binding to the DLL at runtime.
-// odbcstub defines the NSQL... methods used in the sources
-// as indirect function calls.
-// odbcimp uses preos2, odbc and postos2 itself.
-// #include "odbc3imp.hxx"
-
-#else
-
-// Currently, we directly use the ODBC DLL from Watcom SQL (via the supplied lib)
-
-#ifndef ODBC_OS2
-#define ODBC_OS2
-#endif
-
-#include <svpm.h>
-#include <odbc.h>
-#define SQL_API __syscall
-#ifndef SQL_MAX_MESSAGE_LENGTH
-#define SQL_MAX_MESSAGE_LENGTH MAX_MESSAGE_LENGTH
-#endif
-#ifndef SQL_MAX_DSN_LENGTH
-#define SQL_MAX_DSN_LENGTH MAX_DSN_LENGTH
-#endif
-#ifndef SQL_AUTOCOMMIT_ON
-#define SQL_AUTOCOMMIT_ON 1UL
-#endif
-#ifndef SQL_AUTOCOMMIT_OFF
-#define SQL_AUTOCOMMIT_OFF 0UL
-#endif
-
-#define SQL_FETCH_PRIOR SQL_FETCH_PREV
-#define SQL_NO_TOTAL (-4)
-
-#endif
-
-// The ODBC.h from Watcom expects char*, not UCHAR* usually used with ODBC
-#if defined( ICC )
-#define SDB_ODBC_CHAR unsigned char
-#else
-#define SDB_ODBC_CHAR char
-#endif
-
-#endif
-
-//--------------------------------------------------------------------------
-
#ifdef UNX
// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib)
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index d743d1022aa9..eb1c989b0822 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -22,9 +22,6 @@
#include <hash.hxx>
-#ifdef ICC
-#undef _Export
-#endif
class SvClassManager;
struct SvGlobalHashNames
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index 39714151d9c6..0d8782b4977c 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -321,10 +321,6 @@ int main ( int argc, char ** argv)
{
if( !aCommand.aTargetFile.isEmpty() )
{
-#ifdef ICC
- DirEntry aT(aCommand.aTargetFile);
- aT.Kill();
-#endif
// stamp file, because idl passed through correctly
SvFileStream aOutStm( aCommand.aTargetFile,
STREAM_READWRITE | STREAM_TRUNC );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 0c7e82b09618..b7b7621b30f4 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5115,13 +5115,8 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
if (!r.HasType(RT_DATABASE) && !pLocalList->findByUpperName(itr->first))
ppSortArray[j++] = &r;
}
-#ifndef ICC
qsort( (void*)ppSortArray, nValidCount, sizeof(ScRangeData*),
&ScRangeData_QsortNameCompare );
-#else
- qsort( (void*)ppSortArray, nValidCount, sizeof(ScRangeData*),
- ICCQsortNameCompare );
-#endif
OUString aName;
OUStringBuffer aContent;
OUString aFormula;
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index d39988c39b28..bf31a1ed94c7 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -48,30 +48,12 @@ typedef ::std::vector< Conversation* > ConvList;
class DdeInternal
{
public:
-#ifdef WNT
static HDDEDATA CALLBACK CliCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
static HDDEDATA CALLBACK SvrCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
static HDDEDATA CALLBACK InfCallback
( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-#else
-#if defined( ICC )
- static HDDEDATA CALLBACK CliCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK SvrCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK InfCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-#else
- static HDDEDATA CALLBACK _export CliCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK _export SvrCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
- static HDDEDATA CALLBACK _export InfCallback
- ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD );
-#endif
-#endif
static DdeService* FindService( HSZ );
static DdeTopic* FindTopic( DdeService&, HSZ );
static DdeItem* FindItem( DdeTopic&, HSZ );
diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index 3e0293707c6d..743d0b338ecc 100644
--- a/svl/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.cxx
@@ -26,18 +26,8 @@
// --- DdeInternal::InfCallback() ----------------------------------
-#ifdef WNT
HDDEDATA CALLBACK DdeInternal::InfCallback(
WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
-#else
-#if defined( ICC )
-HDDEDATA CALLBACK DdeInternal::InfCallback(
- WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
-#else
-HDDEDATA CALLBACK _export DdeInternal::InfCallback(
- WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD )
-#endif
-#endif
{
return (HDDEDATA)DDE_FNOTPROCESSED;
}
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index beeb3d8be47f..ecce24a15644 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -46,15 +46,9 @@ class DdeItemImp : public std::vector<DdeItemImpData> {};
// --- DdeInternat::SvrCallback() ----------------------------------
-#if defined( WNT ) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
-#else
-HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
- WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
- HDDEDATA hData, DWORD, DWORD )
-#endif
{
DdeServices& rAll = DdeService::GetServices();
DdeService* pService;
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index bcbe75c5f4ec..6efa927e7c6f 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -20,10 +20,6 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_H
-#if defined( ICC )
-#include <stdio.h>
-#endif
-
#if defined (UNX) || defined(__MINGW32__)
#include <sys/types.h>
#endif
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 232218957c61..89375271e9c7 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -364,7 +364,6 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos,
{
if ( pItems[i].mnWidth && pItems[i].mnHeight )
{
- // Wegen ICC auftrennen
Point aPoint( pItems[i].mnLeft, pItems[i].mnTop );
Size aSize( pItems[i].mnWidth, pItems[i].mnHeight );
Rectangle aRect( aPoint, aSize );
@@ -999,7 +998,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet )
{
if ( pSet->mpBitmap || pSet->mpWallpaper )
{
- // Wegen ICC auftrennen
Point aPoint( pItems[i].mnLeft, pItems[i].mnTop );
Size aSize( pItems[i].mnWidth, pItems[i].mnHeight );
Rectangle aRect( aPoint, aSize );
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 67feefc0b0ff..9e6fd34e020b 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -34,11 +34,7 @@ extern "C"
#ifdef __MINGW32__
sal_Bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
#else
-#ifdef ICC
-int _CRT_init(void);
-#else
BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved );
-#endif
BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
#endif
@@ -48,11 +44,7 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
aSalShlData.mhInst = hInst;
#ifndef __MINGW32__
-#ifdef ICC
- if ( _CRT_init() == -1 )
-#else
if ( !_CRT_INIT( hInst, nReason, pReserved ) )
-#endif
return 0;
#else
(void)pReserved;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 23:48:28 +0000