diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:14:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:14:43 +0000 |
| commit | 070eeae710613a45cfb46efe4448afea84cb64df (patch) | |
| tree | d3bb84f2c4770f9a6d959b125e21e5edda88359c /dbaccess/source/ui/app/AppController.hxx | |
| parent | INTEGRATION: CWS dba201b (1.20.26); FILE MERGED (diff) | |
| download | core-070eeae710613a45cfb46efe4448afea84cb64df.tar.gz core-070eeae710613a45cfb46efe4448afea84cb64df.zip | |
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
Diffstat (limited to 'dbaccess/source/ui/app/AppController.hxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index d71b4034e84d..f9685f8af422 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -4,9 +4,9 @@ * * $RCSfile: AppController.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:19:02 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:14:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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 @@ namespace dbaui { 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 @@ namespace dbaui 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; |