rpms/openoffice.org/devel openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch, 1.1, 1.2 openoffice.org.spec, 1.903, 1.904

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12646

Modified Files:
	openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch 
	openoffice.org.spec 
Log Message:
openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch

openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch:
 binfilter/inc/bf_svx/svdobj.hxx |    2 +-
 inc/bf_svx/svdobj.hxx           |    0 
 inc/svdobj.hxx                  |    0 
 svx/inc/svdobj.hxx              |    2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

Index: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch	31 Oct 2006 14:37:41 -0000	1.1
+++ openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch	1 Nov 2006 09:44:21 -0000	1.2
@@ -14,3 +14,19 @@
  	UINT32  GetInventor() const { return nInventor; }
  	UINT16  GetId() const { return nIdentifier; }
  	//BFS01virtual void WriteData(SvStream& rOut);
+Index: inc/bf_svx/svdobj.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/svdobj.hxx,v
+retrieving revision 1.5
+diff -u -r1.5 svdobj.hxx
+--- openoffice.org.orig/binfilter/inc/bf_svx/svdobj.hxx	9 Sep 2005 14:38:27 -0000	1.5
++++ openoffice.org/binfilter/inc/bf_svx/svdobj.hxx	1 Nov 2006 09:42:05 -0000
+@@ -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);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -r1.903 -r1.904
--- openoffice.org.spec	31 Oct 2006 17:07:05 -0000	1.903
+++ openoffice.org.spec	1 Nov 2006 09:44:21 -0000	1.904
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 8
+%define rh_rpm_release 7
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2543,13 +2543,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Oct 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.8
+* Wed Nov 01 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.7
+- add openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch for bad pure virtual
 - Resolves: rhbz#213203 openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
 - Resolves: rhbz#212988 try /tmp if /home fails, and abort with a message instead of segv
-
-* Tue Oct 31 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.7
 - rebuild for curl
-- add openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch for bad pure virtual
 
 * Mon Oct 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.6
 - add openoffice.org-2.0.4.ooo70601.sd.sal_uInt32_aslong.patch