User: ihi Date: 2007/04/16 09:28:42 Modified: dba/dbaccess/source/ui/misc/documentcontroller.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: documentcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/documentcontroller.cxx?r1=1.4&r2=1.5 Delta lines: +7 -5 ------------------- --- documentcontroller.cxx 17 Sep 2006 07:17:03 -0000 1.4 +++ documentcontroller.cxx 16 Apr 2007 16:28:39 -0000 1.5 @@ -71,7 +71,7 @@ ,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 @@ { 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 @@ { 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& ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
