User: ihi Date: 2006/08/28 08:06:57 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: INTEGRATION: CWS dba205a (1.176.10); FILE MERGED 2006/07/20 07:58:29 fs 1.176.10.2: #i66339# corrected assertion 2006/07/20 07:43:03 fs 1.176.10.1: #i66339# corrected assertion File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.177&r2=1.178 Delta lines: +3 -4 ------------------- --- unodatbr.cxx 15 Aug 2006 10:49:53 -0000 1.177 +++ unodatbr.cxx 28 Aug 2006 15:06:55 -0000 1.178 @@ -2917,11 +2917,10 @@ DBTreeListModel::DBTreeListUserData* pTreeListData = static_cast< DBTreeListModel::DBTreeListUserData* >( _pDSEntry->GetUserData() ); if ( pTreeListData ) { - impl_releaseConnection( pTreeListData->xConnection ); + DBG_ASSERT( !pTreeListData->xConnection.is() == !!pTreeListData->aController.empty(), + "SbaTableQueryBrowser::disposeConnection: inconsistency: there should either be a connection and a controller, or none of both!" ); - // release the model-controller-connection - DBG_ASSERT( !pTreeListData->aController.empty(), - "SbaTableQueryBrowser::disposeConnection: there's a connection, but we didn't register ourself as controller at the model?!" ); + impl_releaseConnection( pTreeListData->xConnection ); pTreeListData->aController.clear(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
