rpms/openoffice.org/devel openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch, NONE, 1.1 openoffice.org.spec, 1.306, 1.307

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch 
Log Message:
add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch

openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch:
 connectivity/source/drivers/evoab2/NConnection.hxx       |    2 +-
 connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx |    8 ++++----
 source/drivers/evoab2/NConnection.hxx                    |    0 
 source/drivers/evoab2/NDatabaseMetaData.hxx              |    0 
 4 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch ---
Index: source/drivers/evoab2/NConnection.hxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NConnection.hxx,v
retrieving revision 1.2
diff -u -p -r1.2 NConnection.hxx
--- openoffice.org.orig/connectivity/source/drivers/evoab2/NConnection.hxx	9 Jun 2005 14:10:18 -0000	1.2
+++ openoffice.org/connectivity/source/drivers/evoab2/NConnection.hxx	15 Jul 2005 11:18:28 -0000
@@ -143,7 +143,7 @@ namespace connectivity
 			inline const OEvoabDriver*	getDriver()				const { return static_cast< const OEvoabDriver* >( m_pDriver );			}
 			
 			SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;}
-			SDBCAddress::sdbc_address_type setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;}
+			void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;}
 						
 			// OComponentHelper
 			virtual void SAL_CALL disposing(void);
Index: source/drivers/evoab2/NDatabaseMetaData.hxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx,v
retrieving revision 1.2
diff -u -p -r1.2 NDatabaseMetaData.hxx
--- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	9 Jun 2005 14:10:46 -0000	1.2
+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	15 Jul 2005 11:18:31 -0000
@@ -88,10 +88,10 @@ namespace connectivity
 		//**************************************************************
 
 		const GParamSpec *getField(guint n);
-		guint             getFieldCount() G_GNUC_CONST;
-		sal_Int32		 getFieldType(sal_Int32 nCol) G_GNUC_CONST;
-		rtl::OUString	 getFieldTypeName(sal_Int32 nCol) G_GNUC_CONST;
-		rtl::OUString     getFieldName(sal_Int32 nCol) G_GNUC_CONST;
+		guint             getFieldCount();
+		sal_Int32		 getFieldType(sal_Int32 nCol);
+		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
+		rtl::OUString     getFieldName(sal_Int32 nCol);
 		
 		class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase
 		{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- openoffice.org.spec	15 Jul 2005 07:20:49 -0000	1.306
+++ openoffice.org.spec	15 Jul 2005 11:34:49 -0000	1.307
@@ -147,6 +147,7 @@
 Patch59: workspace.impress63.patch
 Patch60: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
 Patch61: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
+Patch62: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -780,6 +781,7 @@
 %patch59 -p1 -b .workspace.impress63.patch
 %patch60 -p1 -b .rh163147.thorndale.fontconfig.patch
 %patch61 -p1 -b .ooo51912.nullpointer.wizards.patch
+%patch62 -p1 -b .ooo52023.evoadb2.nognuconst.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -2967,6 +2969,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Jul 15 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-2
+- add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch to
+  fix evoad2
+
 * Wed Jul 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-1
 - bump to next version and drop the integrated (finally) fpicker patch
 - back to using stlport for now because I'm dubious