User: hr Date: 05/09/23 05:14:45 Modified: /dba/dbaccess/source/ui/app/ AppController.hxx
Log: INTEGRATION: CWS dba201b (1.10.44); FILE MERGED 2005/09/21 07:46:11 oj 1.10.44.2: RESYNC: (1.10-1.11); FILE MERGED 2005/07/20 10:12:50 fs 1.10.44.1: #i51255# use a ModelControllerConnector to connect ourself to the model, and to keep it alive as long as we ourself live File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.hxx?r1=1.11&r2=1.12 Delta lines: +25 -16 --------------------- --- AppController.hxx 8 Sep 2005 14:19:02 -0000 1.11 +++ AppController.hxx 23 Sep 2005 12:14:43 -0000 1.12 @@ -84,6 +84,9 @@ #ifndef _DBAUI_LINKEDDOCUMENTS_HXX_ #include "linkeddocuments.hxx" #endif +#ifndef DBACCESS_SOURCE_UI_INC_DOCUMENTCONTROLLER_HXX +#include "documentcontroller.hxx" +#endif #include <memory> @@ -124,9 +127,12 @@ { friend class OConnectionChangeBroadcaster; public: - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > > TContainerVector; - typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > - , ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > > TDocuments; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > TContainer; + typedef ::std::vector< TContainer > TContainerVector; + + typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > TComponent; + typedef ::std::map< TComponent, TComponent > TDocuments; + private: DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,TDataSourceConnections); @@ -135,7 +141,10 @@ TDataSourceConnections m_aDataSourceConnections; TransferableDataHelper m_aSystemClipboard; // content of the clipboard ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + m_xModel; + ModelControllerConnector + m_aModelConnector; TContainerVector m_aCurrentContainers; // the containers where we are listener on TDocuments m_aDocuments; ODsnTypeCollection m_aTypeCollection; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
