User: rt Date: 06/05/04 01:37:34 Modified: /dba/dbaccess/source/core/dataaccess/ connection.hxx
Log: INTEGRATION: CWS dba203c (1.22.110); FILE MERGED 2006/04/25 08:43:48 fs 1.22.110.1: outsourced the warnings handling during #i62646# File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.hxx?r1=1.22&r2=1.23 Delta lines: +6 -11 -------------------- --- connection.hxx 8 Sep 2005 11:38:02 -0000 1.22 +++ connection.hxx 4 May 2006 08:37:32 -0000 1.23 @@ -83,6 +83,9 @@ #ifndef DBA_CORE_REFRESHLISTENER_HXX #include "RefreshListener.hxx" #endif +#ifndef DBA_CORE_WARNINGS_HXX +#include "warning.hxx" +#endif #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif @@ -115,15 +118,14 @@ ,public OSubComponent ,public ::connectivity::OConnectionWrapper ,public OConnection_Base - ,public IWarningsContainer ,public IRefreshListener { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > m_xMasterTables; // just to avoid the recreation of the catalog OWeakRefArray m_aStatements; - OQueryContainer* m_pQueries; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xQueries; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + m_xQueries; OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection @@ -134,7 +136,7 @@ OTableContainer* m_pTables; OViewContainer* m_pViews; - ::com::sun::star::uno::Any m_aAdditionalWarnings; // own warnings (appended to the ones got by the master connection) + WarningsContainer m_aWarnings; sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type sal_Bool m_bSupportsUsers; sal_Bool m_bSupportsGroups; @@ -220,15 +222,8 @@ // IRefreshListener virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); -protected: - // IWarningsContainer - virtual void appendWarning(const ::com::sun::star::sdbc::SQLException& _rWarning); - virtual void appendWarning(const ::com::sun::star::sdbc::SQLWarning& _rWarning); - virtual void appendWarning(const ::com::sun::star::sdb::SQLContext& _rContext); protected: - static void implConcatWarnings(::com::sun::star::uno::Any& _rChainLeft, const ::com::sun::star::uno::Any& _rChainRight); - inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) { if ( rBHelper.bDisposed || !m_xConnection.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
