User: hr Date: 05/09/23 05:04:40 Modified: /dba/dbaccess/source/core/dataaccess/ databasecontext.cxx
Log: INTEGRATION: CWS dba201b (1.30.2); FILE MERGED 2005/09/21 07:00:27 oj 1.30.2.4: RESYNC: (1.30-1.31); FILE MERGED 2005/07/21 14:35:02 fs 1.30.2.3: slight syntax changes to the recently introduced SharedUNOComponent for better readability of client code 2005/07/20 10:19:46 fs 1.30.2.2: #i52171# better control over model ownership 2005/07/11 13:37:00 fs 1.30.2.1: merging CWS dba201 into CWS dba201b File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasecontext.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasecontext.cxx?r1=1.31&r2=1.32 Delta lines: +1 -8 ------------------- --- databasecontext.cxx 8 Sep 2005 11:55:59 -0000 1.31 +++ databasecontext.cxx 23 Sep 2005 12:04:37 -0000 1.32 @@ -187,7 +187,6 @@ //= ODatabaseContext //========================================================================== -DBG_NAME(ODatabaseContext) //-------------------------------------------------------------------------- Reference< XInterface > ODatabaseContext_CreateInstance(const Reference< XMultiServiceFactory > & xServiceManager) @@ -201,13 +200,11 @@ ,m_xServiceManager(xServiceManager) ,m_aContainerListeners(m_aMutex) { - DBG_CTOR(ODatabaseContext,NULL); } //-------------------------------------------------------------------------- ODatabaseContext::~ODatabaseContext() { - DBG_DTOR(ODatabaseContext,NULL); } // Helper @@ -404,11 +401,7 @@ // calls registerPrivate in attachResource xModel->attachResource(_sURL,aArgs); - // since the model has been newly created, we're its owner. However, we do not - // really need it, we ust used it for loading the document. So, dispose it to prevent - // leaks - // #i50905# / 2005-06-20 / [EMAIL PROTECTED] - ::comphelper::disposeComponent( xModel ); + SharedUNOComponent< XModel, CloseableComponent > aEnsureClose( xModel, SharedUNOComponent< XModel, CloseableComponent >::TakeOwnership ); } setTransientProperties(_sURL,xExistent); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
