diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:22:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:22:52 +0000 |
| commit | dcdf72ec0fa3545ec64cb5990c77b2bfa53f236e (patch) | |
| tree | 374ff61a4fb8246a2e0063b8aed653f39f2e1b7a /connectivity | |
| parent | 3721b898be065581b3df8af52682d3b8f8963e33 (diff) | |
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
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/inc/TDatabaseMetaDataBase.hxx | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index acd31eec4022..c107fce008bc 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: TDatabaseMetaDataBase.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 06:39:10 $ + * last change: $Author: kz $ $Date: 2006-12-13 16:22:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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); }; |