User: ihi Date: 2007-11-21 15:33:05+0000 Modified: dba/dbaccess/source/core/api/RowSetCache.cxx
Log: INTEGRATION: CWS dba24c (1.94.56); FILE MERGED 2007/09/18 12:53:53 fs 1.94.56.1: during #i81095#: moved from XMultiServiceFactory to ::comphelper::ComponentContext File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: RowSetCache.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.cxx?r1=1.94&r2=1.95 Delta lines: +3 -3 ------------------- --- RowSetCache.cxx 2007-05-10 10:11:18+0000 1.94 +++ RowSetCache.cxx 2007-11-21 15:33:03+0000 1.95 @@ -139,13 +139,13 @@ // ------------------------------------------------------------------------- ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, - const Reference< XMultiServiceFactory >& _xServiceFactory, + const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew) :m_xSet(_xRs) ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) - ,m_xServiceFactory(_xServiceFactory) + ,m_aContext( _rContext ) ,m_pCacheSet(NULL) ,m_pMatrix(NULL) ,m_pInsertMatrix(NULL) @@ -1460,7 +1460,7 @@ sal_Bool bOk = sal_False; ::rtl::OUString sSql = _xAnalyzer->getQuery(); ::rtl::OUString sErrorMsg; - ::connectivity::OSQLParser aSqlParser(m_xServiceFactory); + ::connectivity::OSQLParser aSqlParser( m_aContext.getLegacyServiceFactory() ); ::std::auto_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); if ( pSqlParseNode.get() && SQL_ISRULE(pSqlParseNode, select_statement) ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
