Index: sc/inc/tabopparams.hxx
===================================================================
RCS file: /cvs/sc/sc/inc/tabopparams.hxx,v
retrieving revision 1.3
diff -u -r1.3 tabopparams.hxx
--- sc/inc/tabopparams.hxx	28 Apr 2003 15:31:06 -0000	1.3
+++ sc/inc/tabopparams.hxx	6 Sep 2003 00:51:03 -0000
@@ -120,7 +120,7 @@
         return *this;
     }
 
-    operator ==( const ScInterpreterTableOpParams& r )
+    BOOL operator ==( const ScInterpreterTableOpParams& r )
     {
         return
             bValid && r.bValid &&
Index: sc/source/core/data/drwlayer.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/drwlayer.cxx,v
retrieving revision 1.20
diff -u -r1.20 drwlayer.cxx
--- sc/source/core/data/drwlayer.cxx	26 Mar 2003 18:03:58 -0000	1.20
+++ sc/source/core/data/drwlayer.cxx	6 Sep 2003 00:51:08 -0000
@@ -1660,7 +1660,7 @@
 	return aName;
 }
 
-inline IsNamedObject( SdrObject* pObj, const String& rName )
+inline BOOL IsNamedObject( SdrObject* pObj, const String& rName )
 {
 	//	TRUE if rName is the object's Name or PersistName
 	//	(used to find a named object)
Index: sc/source/filter/excel/excrecds.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/excrecds.cxx,v
retrieving revision 1.64
diff -u -r1.64 excrecds.cxx
--- sc/source/filter/excel/excrecds.cxx	24 Jul 2003 11:54:34 -0000	1.64
+++ sc/source/filter/excel/excrecds.cxx	6 Sep 2003 00:51:11 -0000
@@ -2572,7 +2572,7 @@
 			INT32					nH;
 			INT32					nW;
 		};
-		static const				nAnzSizes = 42;
+		static const UINT16		nAnzSizes = 42;
 		static const PAPER_SIZE		pPS[ nAnzSizes ] =
 		{
             { 0,                        0                           },  // undefined
Index: sc/source/filter/excel/impop.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/impop.cxx,v
retrieving revision 1.53
diff -u -r1.53 impop.cxx
--- sc/source/filter/excel/impop.cxx	25 Jun 2003 10:46:56 -0000	1.53
+++ sc/source/filter/excel/impop.cxx	6 Sep 2003 00:51:11 -0000
@@ -1221,7 +1221,7 @@
 		INT32		nH;
 		INT32		nW;
 	};
-	static const	nAnzSizes = 42;
+	static const	UINT16 nAnzSizes = 42;
 	static SvxPaper	pSvxPS[ nAnzSizes ] =
 	{
 		SVX_PAPER_USER,		// undefined
Index: sc/source/filter/excel/tokstack.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/tokstack.cxx,v
retrieving revision 1.3
diff -u -r1.3 tokstack.cxx
--- sc/source/filter/excel/tokstack.cxx	23 Oct 2001 09:37:15 -0000	1.3
+++ sc/source/filter/excel/tokstack.cxx	6 Sep 2003 00:51:11 -0000
@@ -132,11 +132,11 @@
 
 	nP_Ext = 32;
 	ppP_Ext = new EXTCONT*[ nP_Ext ];
-	memset( ppP_Ext, NULL, sizeof( EXTCONT* ) * nP_Ext );
+	memset( ppP_Ext, 0, sizeof( EXTCONT* ) * nP_Ext );
 
 	nP_Nlf = 16;
 	ppP_Nlf = new NLFCONT*[ nP_Nlf ];
-	memset( ppP_Nlf, NULL, sizeof( NLFCONT* ) * nP_Nlf );
+	memset( ppP_Nlf, 0, sizeof( NLFCONT* ) * nP_Nlf );
 
 	pScToken = new ScTokenArray;
 
Index: sc/source/filter/xml/xmlsubti.hxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/xml/xmlsubti.hxx,v
retrieving revision 1.22
diff -u -r1.22 xmlsubti.hxx
--- sc/source/filter/xml/xmlsubti.hxx	27 May 2003 10:38:10 -0000	1.22
+++ sc/source/filter/xml/xmlsubti.hxx	6 Sep 2003 00:51:11 -0000
@@ -98,9 +98,9 @@
 
 class ScXMLImport;
 
-const nDefaultRowCount = 20;
-const nDefaultColCount = 20;
-const nDefaultTabCount = 10;
+const sal_Int32 nDefaultRowCount = 20;
+const sal_Int32 nDefaultColCount = 20;
+const sal_Int32 nDefaultTabCount = 10;
 
 typedef std::vector<sal_Int32> ScMysalIntVec;
 typedef std::list<sal_Int32> ScMysalIntList;
Index: sc/source/ui/docshell/docsh8.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/docshell/docsh8.cxx,v
retrieving revision 1.15
diff -u -r1.15 docsh8.cxx
--- sc/source/ui/docshell/docsh8.cxx	5 Oct 2001 17:41:05 -0000	1.15
+++ sc/source/ui/docshell/docsh8.cxx	6 Sep 2003 00:51:14 -0000
@@ -454,12 +454,12 @@
 
 // -----------------------------------------------------------------------
 
-inline IsAsciiDigit( sal_Unicode c )
+inline BOOL IsAsciiDigit( sal_Unicode c )
 {
 	return 0x31 <= c && c <= 0x39;
 }
 
-inline IsAsciiAlpha( sal_Unicode c )
+inline BOOL IsAsciiAlpha( sal_Unicode c )
 {
 	return (0x41 <= c && c <= 0x5a) || (0x61 <= c && c <= 0x7a);
 }