Tag: cws_src680_warnings01 User: fs Date: 06/06/14 00:28:25 Modified: /dba/connectivity/source/drivers/kab/ KDatabaseMetaData.cxx
Log: #i66362# don't return NULL in the various XResultSet getter methods File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KDatabaseMetaData.cxx?r1=1.2.28.2&r2=1.2.28.3 Delta lines: +15 -15 --------------------- --- KDatabaseMetaData.cxx 7 Apr 2006 20:21:42 -0000 1.2.28.2 +++ KDatabaseMetaData.cxx 14 Jun 2006 07:28:22 -0000 1.2.28.3 @@ -4,9 +4,9 @@ * * $RCSfile: KDatabaseMetaData.cxx,v $ * - * $Revision: 1.2.28.2 $ + * $Revision: 1.2.28.3 $ * - * last change: $Author: sb $ $Date: 2006/04/07 20:21:42 $ + * last change: $Author: fs $ $Date: 2006/06/14 07:28:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -867,19 +867,19 @@ // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } // ----------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( @@ -1011,14 +1011,14 @@ const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( @@ -1058,39 +1058,39 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( @@ -1098,7 +1098,7 @@ const ::rtl::OUString&, const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { - return NULL; + return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
