Tag: cws_src680_dba201b User: fs Date: 05/07/22 00:02:42 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx /dba/dbaccess/source/ui/browser/ dsbrowserDnD.cxx, unodatbr.cxx /dba/dbaccess/source/ui/misc/ singledoccontroller.cxx
Log: #i10000# File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.20.26.4&r2=1.20.26.5 Delta lines: +7 -4 ------------------- --- AppController.cxx 21 Jul 2005 14:35:54 -0000 1.20.26.4 +++ AppController.cxx 22 Jul 2005 07:02:37 -0000 1.20.26.5 @@ -2,9 +2,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.20.26.4 $ + * $Revision: 1.20.26.5 $ * - * last change: $Author: fs $ $Date: 2005/07/21 14:35:54 $ + * last change: $Author: fs $ $Date: 2005/07/22 07:02:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -458,7 +458,7 @@ ::rtl::OUString() ); } - m_aModelConnector.swap( ModelControllerConnector() ); + m_aModelConnector.clear(); m_xModel.clear(); } } @@ -2387,7 +2387,10 @@ // at least: remove as property change listener from the old model/data source m_xModel = _rxModel; - m_aModelConnector.swap( _rxModel.is() ? ModelControllerConnector( _rxModel, this ) : ModelControllerConnector() ); + if ( _rxModel.is() ) + m_aModelConnector = ModelControllerConnector( _rxModel, this ); + else + m_aModelConnector.clear(); m_xDataSource.set(xOfficeDoc.is() ? xOfficeDoc->getDataSource() : Reference<XDataSource>(),UNO_QUERY); if ( !m_xDataSource.is() ) Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dsbrowserDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx?r1=1.69.38.2&r2=1.69.38.3 Delta lines: +3 -3 ------------------- --- dsbrowserDnD.cxx 20 Jul 2005 10:13:15 -0000 1.69.38.2 +++ dsbrowserDnD.cxx 22 Jul 2005 07:02:38 -0000 1.69.38.3 @@ -2,9 +2,9 @@ * * $RCSfile: dsbrowserDnD.cxx,v $ * - * $Revision: 1.69.38.2 $ + * $Revision: 1.69.38.3 $ * - * last change: $Author: fs $ $Date: 2005/07/20 10:13:15 $ + * last change: $Author: fs $ $Date: 2005/07/22 07:02:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,7 +371,7 @@ } pData->xConnection.clear(); - pData->aController.swap( ModelControllerConnector() ); + pData->aController.clear(); delete pData; } pEntryLoop = m_pTreeModel->Next(pEntryLoop); File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.170.20.5&r2=1.170.20.6 Delta lines: +5 -5 ------------------- --- unodatbr.cxx 21 Jul 2005 14:37:25 -0000 1.170.20.5 +++ unodatbr.cxx 22 Jul 2005 07:02:38 -0000 1.170.20.6 @@ -2,9 +2,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.170.20.5 $ + * $Revision: 1.170.20.6 $ * - * last change: $Author: fs $ $Date: 2005/07/21 14:37:25 $ + * last change: $Author: fs $ $Date: 2005/07/22 07:02:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2031,7 +2031,7 @@ pDSData->sAccessor = sDataSourceId; pDSData->xConnection = _rxConnection; if ( _rxConnection.is() ) - pDSData->aController.swap( ModelControllerConnector( impl_nf_getDBDocumentForConnection( _rxConnection ), this ) ); + pDSData->aController = ModelControllerConnector( impl_nf_getDBDocumentForConnection( _rxConnection ), this ); pDatasourceEntry->SetUserData(pDSData); // the child for the queries container @@ -2925,7 +2925,7 @@ // 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?!" ); - pTreeListData->aController.swap( ModelControllerConnector() ); + pTreeListData->aController.clear(); // clear pTreeListData->xConnection.clear(); @@ -3381,7 +3381,7 @@ DBG_ASSERT( impl_isDataSourceEntry( _pDSEntry ), "SbaTableQueryBrowser::ensureConnection: this is no data source entry!" ); // if this fails, we can't expect pTreeListData->aController to point to a valid // instance, since those instances are only filled for data source entries - pTreeListData->aController.swap( ModelControllerConnector( impl_nf_getDBDocumentForConnection( _rConnection ), this ) ); + pTreeListData->aController = ModelControllerConnector( impl_nf_getDBDocumentForConnection( _rConnection ), this ); } // remember the connection Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: singledoccontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/singledoccontroller.cxx?r1=1.14.44.1&r2=1.14.44.2 Delta lines: +6 -4 ------------------- --- singledoccontroller.cxx 20 Jul 2005 09:57:48 -0000 1.14.44.1 +++ singledoccontroller.cxx 22 Jul 2005 07:02:39 -0000 1.14.44.2 @@ -2,9 +2,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.14.44.1 $ + * $Revision: 1.14.44.2 $ * - * last change: $Author: fs $ $Date: 2005/07/20 09:57:48 $ + * last change: $Author: fs $ $Date: 2005/07/22 07:02:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -366,7 +366,7 @@ disconnect(); - m_aModelConnector.swap( ModelControllerConnector() ); + m_aModelConnector.clear(); attachFrame( Reference < XFrame >() ); @@ -562,7 +562,9 @@ Reference< XOfficeDatabaseDocument > xOfficeDoc( _rxModel, UNO_QUERY ); m_xDataSource.set( xOfficeDoc.is() ? xOfficeDoc->getDataSource() : Reference<XDataSource>(), UNO_QUERY ); - m_aModelConnector.swap( m_xDataSource.is() ? ModelControllerConnector( _rxModel, this ) : ModelControllerConnector() ); + m_aModelConnector.clear(); + if ( m_xDataSource.is() ) + m_aModelConnector = ModelControllerConnector( _rxModel, this ); return sal_True; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
