User: kz Date: 2006/12/13 08:22:54 Modified: dba/connectivity/source/inc/TDatabaseMetaDataBase.hxx
Log: INTEGRATION: CWS dba22ui (1.3.190); FILE MERGED 2006/12/05 15:02:49 fs 1.3.190.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former File Changes: Directory: /dba/connectivity/source/inc/ ======================================== File [changed]: TDatabaseMetaDataBase.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/TDatabaseMetaDataBase.hxx?r1=1.3&r2=1.4 Delta lines: +16 -3 -------------------- --- TDatabaseMetaDataBase.hxx 8 Sep 2005 06:39:10 -0000 1.3 +++ TDatabaseMetaDataBase.hxx 13 Dec 2006 16:22:52 -0000 1.4 @@ -36,8 +36,8 @@ #ifndef _CONNECTIVITY_ODATABASEMETADATABASE_HXX_ #define _CONNECTIVITY_ODATABASEMETADATABASE_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA2_HPP_ +#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp> #endif #ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> @@ -52,18 +52,31 @@ namespace connectivity { class ODatabaseMetaDataBase : public comphelper::OBaseMutex, - public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData, + public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData2, ::com::sun::star::lang::XEventListener> { + private: + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aConnectionInfo; + protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xListenerHelper; // forward the calls from the connection to me virtual ~ODatabaseMetaDataBase(); + + protected: + inline void setConnectionInfo( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) + { + m_aConnectionInfo = _rInfo; + } + public: ODatabaseMetaDataBase(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection); + // XDatabaseMetaData2 + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getConnectionInfo( ) throw (::com::sun::star::uno::RuntimeException); + // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
