User: ihi Date: 2007-11-21 15:37:32+0000 Modified: dba/dbaccess/source/core/dataaccess/connection.cxx
Log: INTEGRATION: CWS dba24c (1.51.132); FILE MERGED 2007/10/26 11:53:14 fs 1.51.132.2: spelling 2007/09/18 12:57:03 fs 1.51.132.1: during #i81095#: moved SingleSelectQueryComposer from XMultiServiceFactory to ::comphelper::ComponentContext File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: connection.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/connection.cxx?r1=1.52&r2=1.53 Delta lines: +2 -2 ------------------- --- connection.cxx 2007-11-02 11:28:17+0000 1.52 +++ connection.cxx 2007-11-21 15:37:29+0000 1.53 @@ -641,7 +641,7 @@ { if (!m_pViews->isInitialized()) { - // check if out "master connection" can supply tables + // check if our "master connection" can supply tables Reference< XViewsSupplier > xMaster(getMasterTables(),UNO_QUERY); if (xMaster.is() && xMaster->getViews().is()) @@ -724,7 +724,7 @@ || ( _sServiceSpecifier.equalsAscii( "com.sun.star.sdb.SingleSelectQueryAnalyzer" ) ) ) { - xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext.getLegacyServiceFactory() ); + xRet = new OSingleSelectQueryComposer( getTables(),this, m_aContext ); m_aComposers.push_back(WeakReferenceHelper(xRet)); } return Reference< XInterface >(xRet,UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
