[PATCH] openoffice.org-2.0 fails to compile on 6-STABLE

[Bartosz Fabianowski]

Hi

I have just upgraded from 2.0.3 to 2.0.4 and compilation broke for me on 
three separate accounts. All three were manifestations of the same error 
in OO.o's source: The keyword "NULL" is used to denote a null pointer, 
which is legal in C but not in C++. The number "0" should be used 
instead. I am surprised that nobody else seems to have run into this. 
Maybe my gcc is more picky about standards for some reason? Either way, 
if anybody else encounters this problem, trivial patches that fix it are 
attached.

- Bartosz
-------------- next part --------------
--- binfilter/inc/bf_svx/svdobj.hxx.orig	Mon Oct 23 13:47:55 2006
+++ binfilter/inc/bf_svx/svdobj.hxx	Mon Oct 23 13:48:08 2006
@@ -265,7 +265,7 @@
 	{}
 	virtual ~SdrObjUserData();
 
-	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
 	UINT32  GetInventor() const { return nInventor; }
 	UINT16  GetId() const { return nIdentifier; }
 	virtual void WriteData(SvStream& rOut);
-------------- next part --------------
--- sc/source/ui/inc/csvcontrol.hxx.orig	Mon Oct 23 16:56:29 2006
+++ sc/source/ui/inc/csvcontrol.hxx	Mon Oct 23 16:56:41 2006
@@ -444,7 +444,7 @@
 
 protected:
     /** Derived classes create a new accessible object here. */
-    virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+    virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
 };
 
 
-------------- next part --------------
--- svx/inc/svdobj.hxx.orig	Mon Oct 23 12:56:33 2006
+++ svx/inc/svdobj.hxx	Mon Oct 23 12:56:50 2006
@@ -323,7 +323,7 @@
 	{}
 	virtual ~SdrObjUserData();
 
-	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+	virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
 	UINT32  GetInventor() const { return nInventor; }
 	UINT16  GetId() const { return nIdentifier; }
 	//BFS01virtual void WriteData(SvStream& rOut);