Fix a breakage when using recent version of gcc-4.1.

This commit is contained in:
Maho Nakata 2006-11-04 03:40:09 +00:00
parent 263a6f8857
commit 5047da89a1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=176330
6 changed files with 204 additions and 0 deletions

View File

@ -0,0 +1,34 @@
--- 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);
--- 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);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

View File

@ -0,0 +1,34 @@
--- 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);
--- 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);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

View File

@ -0,0 +1,34 @@
--- 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);
--- 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);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

View File

@ -0,0 +1,34 @@
--- 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);
--- 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);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

View File

@ -0,0 +1,34 @@
--- 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);
--- 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);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

View File

@ -0,0 +1,34 @@
--- 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);
--- 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);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};