diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 15:28:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-04-16 15:28:39 +0000 |
| commit | 7f4dae5e5d760f391fce8610169827331ec7f95a (patch) | |
| tree | e54d16086a8f445aac9483f1a28b7a84d36fda26 /dbaccess/source/ui/misc/documentcontroller.cxx | |
| parent | fb44a883dd8ec4dc2db38a827003a35d9f92e560 (diff) | |
INTEGRATION: CWS fwkdbdesign01 (1.4.80); FILE MERGED
2007/03/01 21:33:59 fs 1.4.80.2: #i10000# make compile in non-pro build
2007/02/28 10:34:30 oj 1.4.80.1: #i74541# do not connect the sub controller to the db model
Diffstat (limited to 'dbaccess/source/ui/misc/documentcontroller.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/documentcontroller.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/dbaccess/source/ui/misc/documentcontroller.cxx b/dbaccess/source/ui/misc/documentcontroller.cxx index 258a1236cf0b..576090f1ecb8 100644 --- a/dbaccess/source/ui/misc/documentcontroller.cxx +++ b/dbaccess/source/ui/misc/documentcontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: documentcontroller.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:17:03 $ + * last change: $Author: ihi $ $Date: 2007-04-16 16:28:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,7 +71,7 @@ namespace dbaui ,m_xController( _rxController ) { DBG_CTOR( ModelControllerConnector, NULL ); - DBG_ASSERT( m_xModel.is() && m_xController.is(), "ModelControllerConnector::ModelControllerConnector: invalid model or controller!" ); + DBG_ASSERT( _rxModel.is() && m_xController.is(), "ModelControllerConnector::ModelControllerConnector: invalid model or controller!" ); impl_connect(); } @@ -124,8 +124,9 @@ namespace dbaui { try { - if ( m_xModel.is() && m_xController.is() ) - m_xModel->connectController( m_xController ); + Reference< XModel > xModel = m_xModel; + if ( xModel.is() && m_xController.is() ) + xModel->connectController( m_xController ); } catch( const Exception& ) { @@ -138,8 +139,9 @@ namespace dbaui { try { - if ( m_xModel.is() && m_xController.is() ) - m_xModel->disconnectController( m_xController ); + Reference< XModel > xModel = m_xModel; + if ( xModel.is() && m_xController.is() ) + xModel->disconnectController( m_xController ); } catch( const Exception& ) { |