rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85487.evoconnectivity.patch, NONE, 1.1 openoffice.org.spec, 1.1401, 1.1402
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jan 22 19:06:11 UTC 2008
- Previous message (by thread): rpms/jakarta-commons-io/devel commons-parent-3.pom, NONE, 1.1 jakarta-commons-io-jpp-depmap.xml, NONE, 1.1 jakarta-commons-io-settings.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 jakarta-commons-io.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/chkfontpath/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE chkfontpath.spec, 1.17, NONE sources, 1.8, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8495
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.4.0.ooo85487.evoconnectivity.patch
Log Message:
add openoffice.org-2.4.0.ooo85487.evoconnectivity.patch to make it build
openoffice.org-2.4.0.ooo85487.evoconnectivity.patch:
--- NEW FILE openoffice.org-2.4.0.ooo85487.evoconnectivity.patch ---
Index: source/drivers/evoab2/NDatabaseMetaData.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx,v
retrieving revision 1.6.178.1
diff -u -r1.6.178.1 NDatabaseMetaData.cxx
--- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx 18 Jan 2008 14:56:06 -0000 1.6.178.1
+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx 22 Jan 2008 18:58:12 -0000
@@ -285,7 +285,7 @@
OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon)
- : ::connectivity::ODatabaseMetaDataBase(_pCon)
+ : ::connectivity::ODatabaseMetaDataBase(_pCon, _pCon->getConnectionInfo())
,m_pConnection(_pCon)
{
OSL_ENSURE(m_pConnection,"OEvoabDatabaseMetaData::OEvoabDatabaseMetaData: No connection set!");
@@ -368,56 +368,47 @@
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 OEvoabDatabaseMetaData::impl_getMaxStatements_throw( )
@@ -427,8 +418,7 @@
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( )
@@ -485,8 +475,7 @@
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException)
@@ -629,22 +618,19 @@
return sal_False;
}
// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException)
@@ -969,26 +955,22 @@
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException)
{
- sal_Int32 nValue = 0; // 0 means no limit
- return nValue;
+ return 0;// 0 means no limit
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
@@ -1075,10 +1057,8 @@
// ::rtl::OUString::createFromAscii("ALIAS"),
// ::rtl::OUString::createFromAscii("SYNONYM")
};
- ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet();
+ ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
Reference< XResultSet > xRef = pResult;
- // this call initialies the resultset metadata with the corresponding information
- pResult->setTableTypes();
// here we fill the rows which should be visible when ask for data from the resultset returned here
sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString);
@@ -1104,9 +1084,9 @@
* Return the proper type information required by evo driver
*/
- ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet();
+ ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
+
Reference< XResultSet > xResultSet = pResultSet;
- pResultSet->setTypeInfoMap();
static ODatabaseMetaDataResultSet::ORows aRows;
if(aRows.empty())
@@ -1163,9 +1143,8 @@
{
::osl::MutexGuard aGuard( m_aMutex );
- ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet();
+ ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
Reference< XResultSet > xRef = pResult;
- pResult->setTablesMap();
// check if any type is given
// when no types are given then we have to return all tables e.g. TABLE
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1401
retrieving revision 1.1402
diff -u -r1.1401 -r1.1402
--- openoffice.org.spec 22 Jan 2008 15:29:47 -0000 1.1401
+++ openoffice.org.spec 22 Jan 2008 19:05:23 -0000 1.1402
@@ -140,6 +140,7 @@
Patch66: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
Patch67: workspace.sw24bf02.patch
Patch68: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch69: openoffice.org-2.4.0.ooo85487.evoconnectivity.patch
%define instdir %{_libdir}/openoffice.org
@@ -1094,6 +1095,7 @@
%patch66 -p1 -b .ooo85429.sw.a11ycrash.patch
%patch67 -p1 -b .workspace.sw24bf02.patch
%patch68 -p1 -b .ooo85448.emptyrpath.patch
+%patch69 -p1 -b .ooo85487.evoconnectivity.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2865,6 +2867,7 @@
- drop integrated openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
- drop integrated workspace.sw8u10bf04.patch
- drop integrated workspace.impress132.patch
+- add openoffice.org-2.4.0.ooo85487.evoconnectivity.patch to make evoab2 build
* Mon Jan 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.3
- fix openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch for warren
- Previous message (by thread): rpms/jakarta-commons-io/devel commons-parent-3.pom, NONE, 1.1 jakarta-commons-io-jpp-depmap.xml, NONE, 1.1 jakarta-commons-io-settings.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 jakarta-commons-io.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/chkfontpath/devel dead.package, NONE, 1.1 Makefile, 1.2, NONE chkfontpath.spec, 1.17, NONE sources, 1.8, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list