Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-19 13:26:27+0000 Modified: dba/dbaccess/source/ui/misc/datasourceconnector.cxx
Log: m_xDatabaseContext is not needed File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: datasourceconnector.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/datasourceconnector.cxx?r1=1.13&r2=1.13.82.1 Delta lines: +4 -26 -------------------- --- datasourceconnector.cxx 2007-07-24 12:10:26+0000 1.13 +++ datasourceconnector.cxx 2007-12-19 13:26:25+0000 1.13.82.1 @@ -4,9 +4,9 @@ * * $RCSfile: datasourceconnector.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.82.1 $ * - * last change: $Author: rt $ $Date: 2007/07/24 12:10:26 $ + * last change: $Author: fs $ $Date: 2007/12/19 13:26:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -118,7 +118,6 @@ :m_pErrorMessageParent(_pMessageParent) ,m_xORB(_rxORB) { - implConstruct(); } //--------------------------------------------------------------------- @@ -128,27 +127,6 @@ ,m_xORB(_rxORB) ,m_sContextInformation( _rContextInformation ) { - implConstruct(); - } - - //--------------------------------------------------------------------- - void ODatasourceConnector::implConstruct() - { - OSL_ENSURE(m_xORB.is(), "ODatasourceConnector::implConstruct: invalid ORB!"); - if (m_xORB.is()) - { - try - { - Reference< XInterface > xContext = m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT); - OSL_ENSURE(xContext.is(), "ODatasourceConnector::implConstruct: got no data source context!"); - m_xDatabaseContext.set(xContext,UNO_QUERY); - OSL_ENSURE(m_xDatabaseContext.is() || !xContext.is(), "ODatasourceConnector::ODatasourceConnector: missing the XNameAccess interface on the data source context!"); - } - catch(const Exception&) - { - OSL_ENSURE(sal_False, "ODatasourceConnector::implConstruct: caught an exception while creating the data source context!"); - } - } } //--------------------------------------------------------------------- @@ -162,7 +140,7 @@ // get the data source Reference< XDataSource > xDatasource( - getDataSourceByName_displayError( m_xDatabaseContext, _rDataSourceName, m_pErrorMessageParent, m_xORB, _bShowError ), + getDataSourceByName_displayError( _rDataSourceName, m_pErrorMessageParent, m_xORB, _bShowError ), UNO_QUERY ); if ( xDatasource.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
