Tag: cws_src680_kaddrbook User: ebischoff Date: 05/09/01 10:11:34 Modified: /dba/connectivity/source/drivers/kab/ KStatement.cxx, KStatement.hxx, KPreparedStatement.cxx, KPreparedStatement.hxx, KResultSet.cxx, KResultSet.hxx
Log: Simplifying the statements classes File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KStatement.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +45 -85 --------------------- --- KStatement.cxx 31 Aug 2005 14:31:09 -0000 1.1.2.2 +++ KStatement.cxx 1 Sep 2005 17:11:30 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: KStatement.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/31 14:31:09 $ + * last change: $Author: ebischoff $ $Date: 2005/09/01 17:11:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,10 +94,10 @@ using namespace com::sun::star::util; //------------------------------------------------------------------------------ -KabStatement_Base::KabStatement_Base(KabConnection* _pConnection ) - : KabStatement_BASE(m_aMutex), - OPropertySetHelper(KabStatement_BASE::rBHelper), - rBHelper(KabStatement_BASE::rBHelper), +KabCommonStatement::KabCommonStatement(KabConnection* _pConnection ) + : KabCommonStatement_BASE(m_aMutex), + OPropertySetHelper(KabCommonStatement_BASE::rBHelper), + rBHelper(KabCommonStatement_BASE::rBHelper), m_pParseTree(NULL), m_aSQLIterator(_pConnection->createCatalog()->getTables(), _pConnection->getMetaData(), NULL), m_aParser(_pConnection->getDriver()->getMSFactory()), @@ -106,11 +106,11 @@ m_pConnection->acquire(); } // ----------------------------------------------------------------------------- -KabStatement_Base::~KabStatement_Base() +KabCommonStatement::~KabCommonStatement() { } // ----------------------------------------------------------------------------- -KabCondition *KabStatement_Base::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException) +KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException) { if (pParseNode->count() == 3) { @@ -232,7 +232,7 @@ NULL); } //------------------------------------------------------------------------------ -sal_Bool KabStatement_Base::isTableKnown(KabResultSet *pResult) const +sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const { // can handle requests like SELECT * FROM addresses addresses // but cannot handle requests like SELECT * FROM addresses persons @@ -245,7 +245,7 @@ return sal_True; } //------------------------------------------------------------------------------ -void KabStatement_Base::setKabFields(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException) { ::vos::ORef<connectivity::OSQLColumns> xColumns; // selected columns KabResultSetMetaData *pMeta; // meta information - holds the list of KAddressBook fields @@ -261,7 +261,7 @@ pMeta->setKabFields(xColumns); } // ------------------------------------------------------------------------- -void KabStatement_Base::selectAddressees(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQLException) { const OSQLParseNode *pParseNode; KabCondition *pCondition; @@ -285,86 +285,58 @@ // no WHERE clause: get all rows pResult->allKabAddressees(); } -// ------------------------------------------------------------------------- -void KabStatement_Base::disposeResultSet() -{ - // free the cursor if alive - Reference< XComponent > xComp(m_xResultSet.get(), UNO_QUERY); - if (xComp.is()) - xComp->dispose(); - m_xResultSet = Reference< XResultSet>(); -} -//------------------------------------------------------------------------------ -void KabStatement_BASE2::disposing() -{ - ::osl::MutexGuard aGuard(m_aMutex); - - disposeResultSet(); - - if (m_pConnection) - m_pConnection->release(); - m_pConnection = NULL; - - dispose_ChildImpl(); - KabStatement_Base::disposing(); -} //----------------------------------------------------------------------------- -void SAL_CALL KabStatement_BASE2::release() throw() +Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException) { - relase_ChildImpl(); -} -//----------------------------------------------------------------------------- -Any SAL_CALL KabStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException) -{ - Any aRet = KabStatement_BASE::queryInterface(rType); + Any aRet = KabCommonStatement_BASE::queryInterface(rType); if (!aRet.hasValue()) aRet = OPropertySetHelper::queryInterface(rType); return aRet; } // ------------------------------------------------------------------------- -Sequence< Type > SAL_CALL KabStatement_Base::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); - return comphelper::concatSequences(aTypes.getTypes(),KabStatement_BASE::getTypes()); + return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes()); } // ------------------------------------------------------------------------- -void SAL_CALL KabStatement_Base::cancel( ) throw(RuntimeException) +void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); // cancel the current sql statement } // ------------------------------------------------------------------------- -void SAL_CALL KabStatement_Base::close( ) throw(SQLException, RuntimeException) +void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException) { { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } dispose(); } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL KabStatement_Base::execute( +sal_Bool SAL_CALL KabCommonStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); Reference< XResultSet > xRS = executeQuery(sql); return xRS.is(); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabStatement_Base::executeQuery( +Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); printf("Request: "); const unsigned short *p = sql.getStr(); while (*p) putchar(*p++); @@ -400,50 +372,44 @@ NULL); } - m_xResultSet = xRS; // we need a reference to it for later use return xRS; } // ------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL KabStatement_Base::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); // just return our connection here return (Reference< XConnection >) m_pConnection; } // ------------------------------------------------------------------------- -Any SAL_CALL KabStatement::queryInterface( const Type & rType ) throw(RuntimeException) -{ - return KabStatement_Base::queryInterface(rType); -} -// ------------------------------------------------------------------------- -sal_Int32 SAL_CALL KabStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); // the return values gives information about how many rows are affected by executing the sql statement return 0; } // ------------------------------------------------------------------------- -Any SAL_CALL KabStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); return makeAny(m_aLastWarning); } // ------------------------------------------------------------------------- -void SAL_CALL KabStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); m_aLastWarning = SQLWarning(); } // ------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper* KabStatement_Base::createArrayHelper( ) const +::cppu::IPropertyArrayHelper* KabCommonStatement::createArrayHelper( ) const { // this properties are defined by the service statement // they must be in alphabetic order @@ -464,12 +430,12 @@ return new ::cppu::OPropertyArrayHelper(aProps); } // ------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper & KabStatement_Base::getInfoHelper() +::cppu::IPropertyArrayHelper & KabCommonStatement::getInfoHelper() { - return *const_cast<KabStatement_Base*>(this)->getArrayHelper(); + return *const_cast<KabCommonStatement*>(this)->getArrayHelper(); } // ------------------------------------------------------------------------- -sal_Bool KabStatement_Base::convertFastPropertyValue( +sal_Bool KabCommonStatement::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, @@ -480,7 +446,7 @@ return bConverted; } // ------------------------------------------------------------------------- -void KabStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) { // set the value to whatever is nescessary switch (nHandle) @@ -500,7 +466,7 @@ } } // ------------------------------------------------------------------------- -void KabStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const +void KabCommonStatement::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { switch (nHandle) { @@ -521,28 +487,22 @@ // ------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO(KabStatement,"com.sun.star.sdbcx.KabStatement","com.sun.star.sdbc.Statement"); // ----------------------------------------------------------------------------- -void SAL_CALL KabStatement_Base::acquire() throw() -{ - KabStatement_BASE::acquire(); -} -// ----------------------------------------------------------------------------- -void SAL_CALL KabStatement_Base::release() throw() +void SAL_CALL KabCommonStatement::acquire() throw() { - KabStatement_BASE::release(); + KabCommonStatement_BASE::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL KabStatement::acquire() throw() +void SAL_CALL KabCommonStatement::release() throw() { - KabStatement_BASE2::acquire(); + KabCommonStatement_BASE::release(); } // ----------------------------------------------------------------------------- -void SAL_CALL KabStatement::release() throw() +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException) { - KabStatement_BASE2::release(); + return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabStatement_Base::getPropertySetInfo( ) throw(RuntimeException) +KabStatement::KabStatement(KabConnection* _pConnection) + : KabStatement_BASE(_pConnection) { - return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// ----------------------------------------------------------------------------- File [changed]: KStatement.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KStatement.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +23 -43 --------------------- --- KStatement.hxx 31 Aug 2005 14:31:09 -0000 1.1.2.2 +++ KStatement.hxx 1 Sep 2005 17:11:30 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: KStatement.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/31 14:31:09 $ + * last change: $Author: ebischoff $ $Date: 2005/09/01 17:11:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,9 @@ #ifndef _CPPUHELPER_COMPBASE4_HXX_ #include <cppuhelper/compbase4.hxx> #endif +#ifndef _CPPUHELPER_IMPLBASE1_HXX_ +#include <cppuhelper/implbase1.hxx> +#endif #ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include <comphelper/proparrhlp.hxx> #endif @@ -90,27 +93,24 @@ { namespace kab { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable> KabStatement_BASE; + ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE; //************************************************************** - // Class KabStatement_Base + // Class KabCommonStatement // is a base class for the normal statement and for the prepared statement //************************************************************** - class KabStatement_Base : public comphelper::OBaseMutex, - public KabStatement_BASE, + class KabCommonStatement : public comphelper::OBaseMutex, + public KabCommonStatement_BASE, public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<KabStatement_Base> + public comphelper::OPropertyArrayUsageHelper<KabCommonStatement> { ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet > - m_xResultSet; // The last ResultSet created for this Statement ::std::list< ::rtl::OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; @@ -123,7 +123,6 @@ sal_Bool isTableKnown(class KabResultSet *pResult) const; void setKabFields(class KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); void selectAddressees(KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); - void disposeResultSet(); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; @@ -141,16 +140,16 @@ virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; - virtual ~KabStatement_Base(); + virtual ~KabCommonStatement(); public: ::cppu::OBroadcastHelper& rBHelper; - KabStatement_Base(KabConnection *_pConnection); - using KabStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + KabCommonStatement(KabConnection *_pConnection); + using KabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void){KabStatement_BASE::disposing();} + virtual void SAL_CALL disposing(void){KabCommonStatement_BASE::disposing();} // XInterface virtual void SAL_CALL release() throw(); @@ -195,39 +194,20 @@ inline KabConnection* getOwnConnection() const { return m_pConnection; } }; - class KabStatement_BASE2 : public KabStatement_Base, - public OSubComponent<KabStatement_BASE2, KabStatement_BASE> - - { - friend class OSubComponent<KabStatement_BASE2, KabStatement_BASE>; - - public: - KabStatement_BASE2(KabConnection* _pConnection) : - KabStatement_Base(_pConnection ), - OSubComponent<KabStatement_BASE2, KabStatement_BASE>((::cppu::OWeakObject*) _pConnection, this) - { } - - // OComponentHelper - virtual void SAL_CALL disposing(void); - - // XInterface - virtual void SAL_CALL release() throw(); - }; + //************************************************************** + // Class KabStatement + //************************************************************** + typedef ::cppu::ImplInheritanceHelper1< + KabCommonStatement, ::com::sun::star::lang::XServiceInfo > KabStatement_BASE; - class KabStatement : public KabStatement_BASE2, - public ::com::sun::star::lang::XServiceInfo + class KabStatement : public KabStatement_BASE { protected: virtual ~KabStatement() { } public: - KabStatement( KabConnection* _pConnection) : KabStatement_BASE2(_pConnection) { } + KabStatement(KabConnection* _pConnection); DECLARE_SERVICE_INFO(); - - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& rType) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); }; } } File [changed]: KPreparedStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KPreparedStatement.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +39 -39 --------------------- --- KPreparedStatement.cxx 31 Aug 2005 14:31:07 -0000 1.1.2.2 +++ KPreparedStatement.cxx 1 Sep 2005 17:11:30 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: KPreparedStatement.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/31 14:31:07 $ + * last change: $Author: ebischoff $ $Date: 2005/09/01 17:11:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ KabConnection* _pConnection, const TTypeInfoVector& _TypeInfo, const ::rtl::OUString& sql) - : KabStatement_BASE2(_pConnection), + : KabCommonStatement(_pConnection), m_aTypeInfo(_TypeInfo), m_bPrepared(sal_False), m_sSqlStatement(sql), @@ -99,17 +99,17 @@ // ----------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::acquire() throw() { - KabStatement_BASE2::acquire(); + KabCommonStatement::acquire(); } // ----------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::release() throw() { - KabStatement_BASE2::release(); + KabCommonStatement::release(); } // ----------------------------------------------------------------------------- Any SAL_CALL KabPreparedStatement::queryInterface(const Type & rType) throw(RuntimeException) { - Any aRet = KabStatement_BASE2::queryInterface(rType); + Any aRet = KabCommonStatement::queryInterface(rType); if (!aRet.hasValue()) aRet = KabPreparedStatement_BASE::queryInterface(rType); return aRet; @@ -119,13 +119,13 @@ { return comphelper::concatSequences( KabPreparedStatement_BASE::getTypes(), - KabStatement_BASE2::getTypes()); + KabCommonStatement::getTypes()); } // ------------------------------------------------------------------------- Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); if (!m_xMetaData.is()) m_xMetaData = new KabResultSetMetaData(getOwnConnection()); @@ -135,12 +135,12 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); // Reset last warning message try { clearWarnings (); - KabStatement_BASE2::close(); + KabCommonStatement::close(); } catch (SQLException &) { // If we get an error, ignore @@ -153,9 +153,9 @@ sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - Reference< XResultSet> xRS = KabStatement_Base::executeQuery(m_sSqlStatement); + Reference< XResultSet> xRS = KabCommonStatement::executeQuery(m_sSqlStatement); return xRS.is(); } @@ -163,7 +163,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); // same as in statement with the difference that this statement also can contain parameter return 0; @@ -172,13 +172,13 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); return (Reference< XConnection >) m_pConnection; } @@ -186,9 +186,9 @@ Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - Reference< XResultSet > rs = KabStatement_Base::executeQuery(m_sSqlStatement); + Reference< XResultSet > rs = KabCommonStatement::executeQuery(m_sSqlStatement); return rs; } @@ -196,91 +196,91 @@ void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDate(sal_Int32 parameterIndex, const Date& aData) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTime(sal_Int32 parameterIndex, const Time& aVal) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32 parameterIndex, const DateTime& aVal) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDouble(sal_Int32 parameterIndex, double x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setFloat(sal_Int32 parameterIndex, float x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setLong(sal_Int32 parameterIndex, sal_Int64 aVal) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setClob(sal_Int32 parameterIndex, const Reference< XClob >& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBlob(sal_Int32 parameterIndex, const Reference< XBlob >& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setArray(sal_Int32 parameterIndex, const Reference< XArray >& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- @@ -288,13 +288,13 @@ void SAL_CALL KabPreparedStatement::setRef(sal_Int32 parameterIndex, const Reference< XRef >& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale) throw(SQLException, RuntimeException) { - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } @@ -302,42 +302,42 @@ void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - checkDisposed(KabStatement_BASE::rBHelper.bDisposed); + checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); } // ------------------------------------------------------------------------- @@ -371,7 +371,7 @@ case PROPERTY_ID_USEBOOKMARKS: break; default: - KabStatement_Base::setFastPropertyValue_NoBroadcast(nHandle,rValue); + KabCommonStatement::setFastPropertyValue_NoBroadcast(nHandle,rValue); } } // ----------------------------------------------------------------------------- File [changed]: KPreparedStatement.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KPreparedStatement.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +3 -3 ------------------- --- KPreparedStatement.hxx 31 Aug 2005 14:31:08 -0000 1.1.2.2 +++ KPreparedStatement.hxx 1 Sep 2005 17:11:30 -0000 1.1.2.3 @@ -2,9 +2,9 @@ * * $RCSfile: KPreparedStatement.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/31 14:31:08 $ + * last change: $Author: ebischoff $ $Date: 2005/09/01 17:11:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::lang::XServiceInfo> KabPreparedStatement_BASE; - class KabPreparedStatement : public KabStatement_BASE2, + class KabPreparedStatement : public KabCommonStatement, public KabPreparedStatement_BASE { protected: File [changed]: KResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KResultSet.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +3 -3 ------------------- --- KResultSet.cxx 29 Aug 2005 08:43:51 -0000 1.1.2.1 +++ KResultSet.cxx 1 Sep 2005 17:11:31 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: KResultSet.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/29 08:43:51 $ + * last change: $Author: ebischoff $ $Date: 2005/09/01 17:11:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,7 +121,7 @@ return pSupported != pEnd; } // ------------------------------------------------------------------------- -KabResultSet::KabResultSet(KabStatement_Base* pStmt) +KabResultSet::KabResultSet(KabCommonStatement* pStmt) : KabResultSet_BASE(m_aMutex), OPropertySetHelper(KabResultSet_BASE::rBHelper), m_aStatement((OWeakObject*) pStmt), File [changed]: KResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KResultSet.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +4 -4 ------------------- --- KResultSet.hxx 29 Aug 2005 08:43:52 -0000 1.1.2.1 +++ KResultSet.hxx 1 Sep 2005 17:11:31 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: KResultSet.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/29 08:43:52 $ + * last change: $Author: ebischoff $ $Date: 2005/09/01 17:11:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,7 +118,7 @@ public comphelper::OPropertyArrayUsageHelper<KabResultSet> { protected: - KabStatement_Base* m_pStatement; + KabCommonStatement* m_pStatement; ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; @@ -152,7 +152,7 @@ public: DECLARE_SERVICE_INFO(); - KabResultSet(KabStatement_Base *pStmt); + KabResultSet(KabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
