User: rt Date: 2007-07-24 12:04:50+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.hxx
Log: INTEGRATION: CWS dba23b (1.12.22); FILE MERGED 2007/06/28 09:02:47 fs 1.12.22.1: #i78362# controllers and current controller now maintained by the DatabaseDocument, not by the ModelImpl (since they're an XModel aspect) 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.12&r2=1.13 Delta lines: +10 -0 -------------------- --- databasedocument.hxx 2007-04-16 16:24:16+0000 1.12 +++ databasedocument.hxx 2007-07-24 12:04:48+0000 1.13 @@ -92,6 +92,9 @@ //........................................................................ class ODatabaseContext; + +typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > > Controllers; + //============================================================ //= ODatabaseDocument //============================================================ @@ -120,6 +123,9 @@ ::cppu::OInterfaceContainerHelper m_aCloseListener; ::cppu::OInterfaceContainerHelper m_aDocEventListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xCurrentController; + Controllers m_aControllers; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; @@ -333,6 +339,10 @@ */ void impl_closeControllerFrames( sal_Bool _bDeliverOwnership ); + /** disposes the frames of all controllers which are still left in m_aControllers. + */ + void impl_disposeControllerFrames_nothrow(); + /** does a reparenting at the given object container to ourself Calls XChild::setParent at the given object, which must be one of our impl's or our --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
