Tag: cws_src680_dba30 User: fs Date: 2006/07/19 05:12:25 Modified: dba/dbaccess/source/core/api/querycomposer.cxx
Log: RESYNC: (1.63-1.64); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: querycomposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/querycomposer.cxx?r1=1.61.8.3&r2=1.61.8.4 Delta lines: +4 -17 -------------------- --- querycomposer.cxx 20 Apr 2006 06:44:44 -0000 1.61.8.3 +++ querycomposer.cxx 19 Jul 2006 12:12:23 -0000 1.61.8.4 @@ -124,28 +124,15 @@ DBG_NAME(OQueryComposer) // ------------------------------------------------------------------------- -OQueryComposer::OQueryComposer(const Reference< XNameAccess>& _xTableSupplier, - const Reference< XConnection>& _xConnection, - const Reference< XMultiServiceFactory >& _xServiceFactory) +OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) : OSubComponent(m_aMutex,_xConnection) { DBG_CTOR(OQueryComposer,NULL); OSL_ENSURE(_xConnection.is()," Connection cant be null!"); - try - { - Reference< XMultiServiceFactory > xFac( _xConnection, UNO_QUERY ); - if ( xFac.is() ) - { - m_xComposer.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY ); - m_xComposerHelper.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY ); - } - } - catch(Exception) - { - } - if ( !m_xComposer.is() ) - throw ServiceNotRegisteredException( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER, NULL ); + Reference<XMultiServiceFactory> xFac( _xConnection, UNO_QUERY_THROW ); + m_xComposer.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW ); + m_xComposerHelper.set( xFac->createInstance( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW ); } // ------------------------------------------------------------------------- OQueryComposer::~OQueryComposer() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
