User: hr Date: 05/09/23 05:07:51 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: INTEGRATION: CWS dba201b (1.13.6); FILE MERGED 2005/09/21 07:22:39 oj 1.13.6.4: RESYNC: (1.14-1.15); FILE MERGED 2005/07/26 13:08:08 fs 1.13.6.3: RESYNC: (1.13-1.14); FILE MERGED 2005/07/20 10:15:26 fs 1.13.6.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:03 fs 1.13.6.1: merging CWS dba201 into CWS dba201b File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.15&r2=1.16 Delta lines: +8 -1 ------------------- --- dbloader2.cxx 8 Sep 2005 13:59:57 -0000 1.15 +++ dbloader2.cxx 23 Sep 2005 12:07:48 -0000 1.16 @@ -331,16 +331,21 @@ private: sal_Bool impl_executeNewDatabaseWizard( Reference< XModel >& _rxModel, sal_Bool& _bShouldStartTableWizard ); }; +DBG_NAME(DBContentLoader) DBContentLoader::DBContentLoader(const Reference< XMultiServiceFactory >& _rxFactory) :m_xServiceFactory(_rxFactory) ,m_nStartWizard(0) { + DBG_CTOR(DBContentLoader,NULL); + } // ------------------------------------------------------------------------- DBContentLoader::~DBContentLoader() { + + DBG_DTOR(DBContentLoader,NULL); } // ------------------------------------------------------------------------- @@ -558,7 +563,6 @@ if ( bSuccess = xController.is() ) { xController->attachModel(xModel); - xModel->connectController( xController ); xModel->setCurrentController(xController); ::vos::OGuard aGuard(Application::GetSolarMutex()); @@ -628,6 +632,9 @@ if ( rListener.is() ) rListener->loadCancelled( this ); } + + if ( !bSuccess ) + ::comphelper::disposeComponent(xModel); } // ----------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
