User: rt Date: 06/05/04 01:36:57 Modified: /dba/dbaccess/source/core/api/ resultset.hxx
Log: INTEGRATION: CWS dba203c (1.9.110); FILE MERGED 2006/04/25 08:42:51 fs 1.9.110.1: #i62646# don't access the XWarningsContainer interface of our delegator if it doesn't exist File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: resultset.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/resultset.hxx?r1=1.9&r2=1.10 Delta lines: +15 -9 -------------------- --- resultset.hxx 8 Sep 2005 10:10:19 -0000 1.9 +++ resultset.hxx 4 May 2006 08:36:54 -0000 1.10 @@ -35,6 +35,13 @@ #ifndef _DBA_COREAPI_RESULTSET_HXX_ #define _DBA_COREAPI_RESULTSET_HXX_ +#ifndef _DBA_COREAPI_COLUMN_HXX_ +#include "column.hxx" +#endif +#ifndef DBA_CORE_WARNINGS_HXX +#include "warnings.hxx" +#endif + #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> #endif @@ -74,6 +81,7 @@ #ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #endif + #ifndef _CPPUHELPER_PROPSHLP_HXX #include <cppuhelper/propshlp.hxx> #endif @@ -86,9 +94,6 @@ #ifndef _CPPUHELPER_COMPBASE11_HXX_ #include <cppuhelper/compbase11.hxx> #endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ -#include <column.hxx> -#endif #ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include <comphelper/broadcasthelper.hxx> #endif @@ -120,10 +125,12 @@ protected: ONoWeakStatement m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xAggregateAsResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xAggregateAsRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xAggregateAsRowUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate; + WarningsContainer m_aWarnings; OColumns* m_pColumns; sal_Int32 m_nResultSetType; sal_Int32 m_nResultSetConcurrency; @@ -268,9 +275,8 @@ virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: - sal_Bool isReadOnly() const {return m_nResultSetConcurrency == ::com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY;} - void checkReadOnly(); - void checkBookmarkable(); + void checkReadOnly() const; + void checkBookmarkable() const; }; } #endif // _DBA_COREAPI_RESULTSET_HXX_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
