Tag: cws_src680_dba30 User: fs Date: 05/10/13 07:55:36 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: RESYNC: (1.15-1.16); FILE MERGED 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.7.6.4&r2=1.7.6.5 Delta lines: +8 -1 ------------------- --- dbloader2.cxx 30 Sep 2005 06:33:16 -0000 1.7.6.4 +++ dbloader2.cxx 13 Oct 2005 14:55:33 -0000 1.7.6.5 @@ -334,16 +334,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); } // ------------------------------------------------------------------------- @@ -561,7 +566,6 @@ if ( bSuccess = xController.is() ) { xController->attachModel(xModel); - xModel->connectController( xController ); xModel->setCurrentController(xController); ::vos::OGuard aGuard(Application::GetSolarMutex()); @@ -631,6 +635,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]
