User: hr Date: 06/04/19 06:18:55 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.hxx
Log: INTEGRATION: CWS oj17 (1.8.22); FILE MERGED 2006/04/10 07:30:27 oj 1.8.22.4: RESYNC: (1.8-1.9); FILE MERGED 2006/03/20 11:32:01 oj 1.8.22.3: #133634# do not dispose command definitions in database document 2006/03/16 10:36:57 oj 1.8.22.2: #i63113# clear weak reference as well 2006/03/09 06:24:16 oj 1.8.22.1: #i60290# remove globalevent broadcaster File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.9&r2=1.10 Delta lines: +16 -17 --------------------- --- databasedocument.hxx 29 Mar 2006 12:34:04 -0000 1.9 +++ databasedocument.hxx 19 Apr 2006 13:18:53 -0000 1.10 @@ -77,12 +77,15 @@ #ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #endif +#ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_ #include <com/sun/star/embed/XTransactionListener.hpp> +#endif + #include <boost/shared_ptr.hpp> #ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" #endif -#include <cppuhelper/compbase11.hxx> + //........................................................................ namespace dbaccess { @@ -112,7 +115,6 @@ ,public ODatabaseDocument_OfficeDocument { ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener > m_xDocEventBroadcaster; ::cppu::OInterfaceContainerHelper m_aModifyListeners; ::cppu::OInterfaceContainerHelper m_aCloseListener; @@ -301,6 +303,18 @@ // XOfficeDatabaseDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > SAL_CALL getDataSource() throw (::com::sun::star::uno::RuntimeException); + /** clears the given object container + + Clearing is done via disposal - the method calls XComponent::dispose at the given object, + which must be one of our impl's or our object containers (m_xForms, m_xReports, + m_xTableDefinitions, m_xCommandDefinitions) + + @param _rxContainer + the container to clear + */ + static void clearObjectContainer( + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess >& _rxContainer); + private: /** closes the frames of all connected controllers @@ -319,21 +333,6 @@ object containers (m_xForms, m_xReports, m_xTableDefinitions, m_xCommandDefinitions) */ void impl_reparent_nothrow( const ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess >& _rxContainer ); - - /** clears the given object container - - Clearing is done via disposal - the method calls XComponent::dispose at the given object, - which must be one of our impl's or our object containers (m_xForms, m_xReports, - m_xTableDefinitions, m_xCommandDefinitions) - - @param _rxContainer - the container to clear - @param _bResetAndRelease - <TRUE/> if and only if the given container should also be reset and release. - */ - void impl_clearObjectContainer( - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess >& _rxContainer, - bool _bResetAndRelease = false ); /** retrieves the forms or reports contained, creates and initializes it, if necessary --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
