User: hr Date: 05/09/23 05:19:56 Modified: /dba/dbaccess/source/ui/browser/ dbloader.cxx
Log: INTEGRATION: CWS dba201b (1.22.22); FILE MERGED 2005/09/21 07:54:37 oj 1.22.22.3: RESYNC: (1.22-1.23); FILE MERGED 2005/07/20 10:10:48 fs 1.22.22.2: #i51255# no explicit dis/connectController from the outside - controllers are now responsible for this themself, including life time control of the model 2005/07/11 13:37:13 fs 1.22.22.1: merging CWS dba201 into CWS dba201b File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dbloader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dbloader.cxx?r1=1.23&r2=1.24 Delta lines: +6 -4 ------------------- --- dbloader.cxx 8 Sep 2005 14:26:46 -0000 1.23 +++ dbloader.cxx 23 Sep 2005 12:19:53 -0000 1.24 @@ -141,15 +141,20 @@ const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw(); }; +DBG_NAME(DBContentLoader) DBContentLoader::DBContentLoader(const Reference< XMultiServiceFactory >& _rxFactory) :m_xServiceFactory(_rxFactory) { + DBG_CTOR(DBContentLoader,NULL); + } // ------------------------------------------------------------------------- DBContentLoader::~DBContentLoader() { + + DBG_DTOR(DBContentLoader,NULL); } // ------------------------------------------------------------------------- // ------------------------------------------------------------------------- @@ -286,7 +291,6 @@ try { xController->attachModel(xModel); - xModel->connectController( xController ); xModel->setCurrentController(xController); } catch( const Exception& ) @@ -326,9 +330,7 @@ try { if ( xController.is() ) - xController->attachModel(NULL); - if ( xModel.is() ) - xModel->disconnectController( xController ); + xController->attachModel( NULL ); } catch( const Exception& ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
