Tag: cws_src680_kaddrbook User: ebischoff Date: 05/09/02 06:50:52 Modified: /dba/connectivity/source/drivers/kab/ KResultSet.cxx, KConnection.cxx, KStatement.cxx, KPreparedStatement.cxx
Log: Cleanup File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KResultSet.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +3 -3 ------------------- --- KResultSet.cxx 2 Sep 2005 04:25:13 -0000 1.1.2.3 +++ KResultSet.cxx 2 Sep 2005 13:50:49 -0000 1.1.2.4 @@ -2,9 +2,9 @@ * * $RCSfile: KResultSet.cxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/02 04:25:13 $ + * last change: $Author: ebischoff $ $Date: 2005/09/02 13:50:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,8 +95,8 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; +IMPLEMENT_SERVICE_INFO(KabResultSet, "com.sun.star.sdbc.drivers.KabResultSet", "com.sun.star.sdbc.ResultSet"); //------------------------------------------------------------------------------ -// IMPLEMENT_SERVICE_INFO(KabResultSet,"com.sun.star.sdbcx.KabResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL KabResultSet::getImplementationName( ) throw ( RuntimeException) \ { return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.kab.ResultSet"); File [changed]: KConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KConnection.cxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +5 -8 ------------------- --- KConnection.cxx 2 Sep 2005 05:07:18 -0000 1.1.2.3 +++ KConnection.cxx 2 Sep 2005 13:50:49 -0000 1.1.2.4 @@ -1,8 +1,8 @@ /************************************************************************* * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/02 05:07:18 $ + * last change: $Author: ebischoff $ $Date: 2005/09/02 13:50:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,14 +82,14 @@ #endif using namespace connectivity::kab; - -//------------------------------------------------------------------------------ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// -------------------------------------------------------------------------------- + +IMPLEMENT_SERVICE_INFO(KabConnection, "com.sun.star.sdbc.drivers.KabConnection", "com.sun.star.sdbc.Connection") +//----------------------------------------------------------------------------- KabConnection::KabConnection(KabDriver* _pDriver) : OSubComponent<KabConnection, KabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), OMetaConnection_BASE(m_aMutex), @@ -127,9 +127,6 @@ osl_decrementInterlockedCount( &m_refCount ); } // XServiceInfo -// -------------------------------------------------------------------------------- -IMPLEMENT_SERVICE_INFO(KabConnection, "com.sun.star.sdbc.drivers.kab.KabConnection", "com.sun.star.sdbc.Connection") - // -------------------------------------------------------------------------------- Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLException, RuntimeException) { File [changed]: KStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KStatement.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +8 -5 ------------------- --- KStatement.cxx 1 Sep 2005 19:39:11 -0000 1.1.2.4 +++ KStatement.cxx 2 Sep 2005 13:50:49 -0000 1.1.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: KStatement.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/01 19:39:11 $ + * last change: $Author: ebischoff $ $Date: 2005/09/02 13:50:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,6 +99,7 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; +IMPLEMENT_SERVICE_INFO(KabStatement, "com.sun.star.sdbc.drivers.KabStatement", "com.sun.star.sdbc.Statement"); //------------------------------------------------------------------------------ KabCommonStatement::KabCommonStatement(KabConnection* _pConnection ) : KabCommonStatement_BASE(m_aMutex), @@ -351,7 +352,11 @@ ::rtl::OUString aErr; m_pParseTree = m_aParser.parseTree(aErr, sql); -// aErr is currently ignored + if (m_pParseTree == NULL) + throw SQLException(aErr, *this, ::rtl::OUString(), 0, Any()); +// the above line is copied from another driver, but I did not succeed in +// triggering a single case where m_ParseTree was NULL or where aErr was not empty + m_aSQLIterator.setParseTree(m_pParseTree); m_aSQLIterator.traverseAll(); switch (m_aSQLIterator.getStatementType()) @@ -488,8 +493,6 @@ ; } } -// ------------------------------------------------------------------------- -IMPLEMENT_SERVICE_INFO(KabStatement,"com.sun.star.sdbcx.KabStatement","com.sun.star.sdbc.Statement"); // ----------------------------------------------------------------------------- void SAL_CALL KabCommonStatement::acquire() throw() { File [changed]: KPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KPreparedStatement.cxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +4 -4 ------------------- --- KPreparedStatement.cxx 2 Sep 2005 02:42:02 -0000 1.1.2.4 +++ KPreparedStatement.cxx 2 Sep 2005 13:50:50 -0000 1.1.2.5 @@ -2,9 +2,9 @@ * * $RCSfile: KPreparedStatement.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/02 02:42:02 $ + * last change: $Author: ebischoff $ $Date: 2005/09/02 13:50:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,8 +78,8 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; -IMPLEMENT_SERVICE_INFO(KabPreparedStatement,"com.sun.star.sdbcx.kab.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); - +IMPLEMENT_SERVICE_INFO(KabPreparedStatement, "com.sun.star.sdbc.drivers.KabPreparedStatement", "com.sun.star.sdbc.PreparedStatement"); +// ------------------------------------------------------------------------- KabPreparedStatement::KabPreparedStatement( KabConnection* _pConnection, const ::rtl::OUString& sql) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
