Tag: cws_src680_kaddrbook User: ebischoff Date: 05/09/02 08:57:14 Modified: /dba/connectivity/source/drivers/kab/ KDatabaseMetaData.cxx, KDatabaseMetaData.hxx, KConnection.hxx
Log: Fixing ownership of connection in database metadata 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.1.2.3&r2=1.1.2.4 Delta lines: +4 -4 ------------------- --- KDatabaseMetaData.cxx 2 Sep 2005 08:44:22 -0000 1.1.2.3 +++ KDatabaseMetaData.cxx 2 Sep 2005 15:57:11 -0000 1.1.2.4 @@ -2,9 +2,9 @@ * * $RCSfile: KDatabaseMetaData.cxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: ebischoff $ $Date: 2005/09/02 08:44:22 $ + * last change: $Author: ebischoff $ $Date: 2005/09/02 15:57:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ using namespace com::sun::star::sdbc; KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon) - : m_pConnection(_pCon), + : m_xConnection(_pCon), m_bUseCatalog(sal_True) { OSL_ENSURE(m_pConnection,"KabDatabaseMetaData::KabDatabaseMetaData: No connection set!"); @@ -810,7 +810,7 @@ // ------------------------------------------------------------------------- Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) { - return (Reference< XConnection >) m_pConnection; + return (Reference< XConnection >) m_xConnection.get(); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) File [changed]: KDatabaseMetaData.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KDatabaseMetaData.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +7 -5 ------------------- --- KDatabaseMetaData.hxx 29 Aug 2005 08:43:49 -0000 1.1.2.1 +++ KDatabaseMetaData.hxx 2 Sep 2005 15:57:11 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: KDatabaseMetaData.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/29 08:43:49 $ + * last change: $Author: ebischoff $ $Date: 2005/09/02 15:57:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,9 @@ #ifndef _CONNECTIVITY_KAB_DATABASEMETADATA_HXX_ #define _CONNECTIVITY_KAB_DATABASEMETADATA_HXX_ +#ifndef _CONNECTIVITY_KAB_CONNECTION_HXX_ #include "KConnection.hxx" +#endif #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> @@ -83,12 +85,12 @@ class KabDatabaseMetaData : public KabDatabaseMetaData_BASE { - KabConnection* m_pConnection; + ::com::sun::star::uno::Reference< KabConnection > m_xConnection; sal_Bool m_bUseCatalog; public: - inline KabConnection* getOwnConnection() const { return m_pConnection; } + inline KabConnection* getOwnConnection() const { return m_xConnection.get(); } KabDatabaseMetaData(KabConnection* _pCon); virtual ~KabDatabaseMetaData(); File [changed]: KConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KConnection.hxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +5 -5 ------------------- --- KConnection.hxx 2 Sep 2005 05:07:18 -0000 1.1.2.3 +++ KConnection.hxx 2 Sep 2005 15:57:12 -0000 1.1.2.4 @@ -2,9 +2,9 @@ * * $RCSfile: KConnection.hxx,v $ * - * $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 15:57:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,9 +65,6 @@ #include <map> #include <kabc/stdaddressbook.h> -#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ -#include <com/sun/star/sdbc/SQLWarning.hpp> -#endif #ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_ #include "OSubComponent.hxx" #endif @@ -76,6 +73,9 @@ #endif #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ +#include <com/sun/star/sdbc/SQLWarning.hpp> #endif #ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
