User: obo Date: 2006/07/10 08:33:29 Modified: dba/dbaccess/source/ui/inc/singledoccontroller.hxx
Log: INTEGRATION: CWS qiq (1.12.118); FILE MERGED 2006/05/17 11:47:21 fs 1.12.118.1: SharedConnection (during #i51143#) File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: singledoccontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/singledoccontroller.hxx?r1=1.12&r2=1.13 Delta lines: +17 -6 -------------------- --- singledoccontroller.hxx 23 Sep 2005 12:35:50 -0000 1.12 +++ singledoccontroller.hxx 10 Jul 2006 15:33:27 -0000 1.13 @@ -57,6 +57,9 @@ #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #endif +#ifndef _DBAUI_COMMON_TYPES_HXX_ +#include "commontypes.hxx" +#endif #ifndef DBAUI_IENVIRONMENT_HXX #include "IEnvironment.hxx" #endif @@ -66,6 +69,9 @@ #ifndef _UNDO_HXX #include <svtools/undo.hxx> #endif +#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX +#include <connectivity/dbmetadata.hxx> +#endif #include <memory> @@ -93,15 +99,14 @@ private: ::com::sun::star::uno::Any m_aCurrentError; // contains the current error which can be set through IEnvironment // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; + SharedConnection m_xConnection; + ::dbtools::DatabaseMetaData m_aSdbMetaData; // </properties> ::rtl::OUString m_sDataSourceName; // the data source we're working for ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; ModelControllerConnector m_aModelConnector; - sal_Bool m_bOwnConnection : 1; // is true when we created our own connection sal_Bool m_bSuspended : 1; // is true when the controller was already suspended sal_Bool m_bEditable : 1; // is the control readonly or not sal_Bool m_bModified : 1; // is the data modified @@ -146,6 +151,12 @@ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > getMetaData( ) const { return isConnected() ? m_xConnection->getMetaData() : ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >(); } + + /** provides to the SDB-level database meta data of the current connection + */ + const ::dbtools::DatabaseMetaData& + getSdbMetaData() const { return m_aSdbMetaData; } + // ---------------------------------------------------------------- // access to the data source ::rtl::OUString getDataSourceName() const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
