CWS-TOOLING: integrate CWS codecleanup02

15 files changed, 6 insertions, 87 deletions

diff --git a/sc/addin/inc/addin.h b/sc/addin/inc/addin.h
index 419d0e3a59db..82b84b402294 100644
--- a/sc/addin/inc/addin.h
+++ b/sc/addin/inc/addin.h
@@ -67,18 +67,11 @@ typedef enum
     NONE
 } ParamType;
 
-#ifndef WIN
 #ifdef WNT
 #define CALLTYPE        __cdecl
 #else
 #define CALLTYPE
 #endif
-#else
-#define PASCAL          _pascal
-#define FAR             _far
-#define CALLTYPE        FAR PASCAL
-#endif
-
 
 #ifdef __cplusplus
 
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index c5d49632292e..64dd9e3e7ea6 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -133,12 +133,6 @@ const SCROW SCROWS64K = 65536;
 
 // === old stuff defines =====================================================
 
-#ifdef WIN
-// Under 16bit Windows rows still had to be limited to 8192.
-// (define manually for testing)
-#define SC_LIMIT_ROWS
-#endif
-
 #define MAXROW_30   8191
 #define MAXROW_40   31999
 
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index 58962ea18c03..1e78f0a951be 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -35,17 +35,11 @@
 #define MAXARRSIZE      0xfffe
 
 //------------------------------------------------------------------------
-#ifndef WIN
 #ifndef WNT
 #define CALLTYPE
 #else
 #define CALLTYPE            __cdecl
 #endif
-#else
-#define PASCAL              _pascal
-#define FAR                 _far
-#define CALLTYPE            FAR PASCAL
-#endif
 
 extern "C" {
 typedef void (CALLTYPE* AdvData)( double& nHandle, void* pData );
diff --git a/sc/inc/unoguard.hxx b/sc/inc/unoguard.hxx
index 0768eada24d7..e5e57e959e7b 100644
--- a/sc/inc/unoguard.hxx
+++ b/sc/inc/unoguard.hxx
@@ -30,7 +30,7 @@
 
 #include <vos/mutex.hxx>
 
-class ScUnoGuard : public NAMESPACE_VOS(OGuard)
+class ScUnoGuard : public vos::OGuard
 {
 public:
             ScUnoGuard();
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index baaabd3a8c8f..e534bb9dfb78 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sc.hxx"
 
+// INCLUDE ---------------------------------------------------------------
+
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
 #include <unotools/textsearch.hxx>
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index fc3d9bf51be2..58ee1b06f7f7 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -175,25 +175,9 @@ void ScChartPositioner::GlueState()
     const BYTE nOccu = 1;
     const BYTE nFree = 2;
     const BYTE nGlue = 3;
-#ifdef WIN
-    // we hate 16bit, don't we?
-    BYTE huge* p;
-    BYTE huge* pA = (BYTE huge*) SvMemAlloc( nCR );
-    if ( nCR > (ULONG)((USHORT)~0) )
-    {   // in 32k Bloecken initialisieren
-        ULONG j;
-        for ( j=0; j<nCR; j+=0x8000 )
-        {
-            memset( pA+j, nHole, Min( (ULONG)0x8000, nCR-j ) );
-        }
-    }
-    else
-        memset( pA, nHole, nCR * sizeof(BYTE) );
-#else
     BYTE* p;
     BYTE* pA = new BYTE[ nCR ];
     memset( pA, 0, nCR * sizeof(BYTE) );
-#endif
 
     SCCOL nCol, nCol1, nCol2;
     SCROW nRow, nRow1, nRow2;
@@ -285,11 +269,7 @@ void ScChartPositioner::GlueState()
         eGlue = SC_CHARTGLUE_NONE;
     }
 
-#ifdef WIN
-    SvMemFree( pA );
-#else
     delete [] pA;
-#endif
 }
 
 void ScChartPositioner::CheckColRowHeaders()
@@ -524,9 +504,6 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
         nRowCount( nChartRows )
 {
     DBG_ASSERT( nColCount && nRowCount, "ScChartPositionMap without dimension" );
-#ifdef WIN
-#error ScChartPositionMap not implemented for 16-bit dumdums
-#endif
 
     ScAddress* pPos;
     SCCOL nCol;
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 35c63f52a92b..461bdcccf27c 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2976,10 +2976,6 @@ void ScInterpreter::ScMin( BOOL bTextAsZero )
         PushDouble(nMin);
 }
 
-#if defined(WIN) && defined(MSC)
-#pragma optimize("",off)
-#endif
-
 void ScInterpreter::ScMax( BOOL bTextAsZero )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScMax" );
@@ -3100,10 +3096,6 @@ void ScInterpreter::ScMax( BOOL bTextAsZero )
     else
         PushDouble(nMax);
 }
-#if defined(WIN) && defined(MSC)
-#pragma optimize("",on)
-#endif
-
 
 double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
 {
@@ -5789,10 +5781,6 @@ void ScInterpreter::ScVLookup()
     CalculateLookup(FALSE);
 }
 
-#if defined(WIN) && defined(MSC)
-#pragma optimize("",off)
-#endif
-
 void ScInterpreter::ScSubTotal()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSubTotal" );
@@ -5832,10 +5820,6 @@ void ScInterpreter::ScSubTotal()
         PushDouble( nVal );
     }
 }
-#if defined(WIN) && defined(MSC)
-#pragma optimize("",on)
-#endif
-
 
 ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
 {
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index dac5f0c99ac5..404eaf763a51 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -682,10 +682,6 @@ void ScInterpreter::ScNPV()
     }
 }
 
-#if defined(WIN) && defined(MSC)
-#pragma optimize("",off)
-#endif
-
 void ScInterpreter::ScIRR()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIRR" );
@@ -752,10 +748,6 @@ void ScInterpreter::ScIRR()
     else
         PushError( errNoConvergence);
 }
-#if defined(WIN) && defined(MSC)
-#pragma optimize("",on)
-#endif
-
 
 void ScInterpreter::ScMIRR()
 {   // range_of_values ; rate_invest ; rate_reinvest
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 209d24ac043d..059f5ba7426b 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -87,7 +87,7 @@
 #include "excimp8.hxx"
 #include "excform.hxx"
 
-#if defined( WNT ) || defined( WIN )
+#if defined( WNT )
 #include <math.h>
 #else
 #include <stdlib.h>
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 2f6f81b7279c..33b3c8e30b97 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -48,7 +48,7 @@
 #include "lotattr.hxx"
 
 
-static NAMESPACE_VOS( OMutex )      aLotImpSemaphore;
+static vos:: OMutex         aLotImpSemaphore;
 
 
 ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, CharSet eQ ) :
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 4ab0c8bb3b14..058898d16547 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -73,7 +73,7 @@
 #include <string.h>
 #include <math.h>
 #include <ctype.h>
-#if defined( MAC ) || defined( ICC )
+#if defined( ICC )
 #include <stdlib.h>
 #endif
 
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 171daa0ca882..42f2a2d86933 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -46,13 +46,8 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include "miscuno.hxx"
 
-
 //! TODO make dynamic
-#ifdef WIN
-const SCSIZE ASCIIDLG_MAXROWS                = 10000;
-#else
 const SCSIZE ASCIIDLG_MAXROWS                = MAXROWCOUNT;
-#endif
 
 
 using namespace rtl;
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 340e71faa71c..ef7e0d675162 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -129,10 +129,6 @@
 //#define _GRAPH_HXX
 #define _SOUND_HXX
 
-#if defined  WIN
-#define _MENUBTN_HXX
-#endif
-
 //svtools
 #define _SCRWIN_HXX
 #define _RULER_HXX
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 07af90f797aa..84868b5377de 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -126,10 +126,6 @@
 //#define _GRAPH_HXX
 #define _SOUND_HXX
 
-#if defined  WIN
-#define _MENUBTN_HXX
-#endif
-
 //svtools
 #define _SCRWIN_HXX
 #define _RULER_HXX
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 24fab9ac2eba..3104b7ed8b8f 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -34,10 +34,6 @@
 
 #define _SV_NOXSOUND
 
-#ifdef WIN
-    #define _MENUBTN_HXX
-#endif
-
 #define _BASE_DLGS_HXX
 #define _BIGINT_HXX
 #define _CACHESTR_HXX