User: vg      
Date: 05/03/10 08:30:43

Modified:
 /dba/dbaccess/source/core/api/
  KeySet.cxx

Log:
 INTEGRATION: CWS dba24 (1.54.20); FILE MERGED
 2005/02/21 13:07:23 oj 1.54.20.2: RESYNC: (1.54-1.55); FILE MERGED
 2005/02/10 09:25:14 oj 1.54.20.1: #i30004# fix for query to be set, the 
interface for XSingleSelectQueryComposer changed but the code here was not 
adjusted :-(

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: KeySet.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/KeySet.cxx?r1=1.55&r2=1.56
Delta lines:  +6 -5
-------------------
--- KeySet.cxx  16 Feb 2005 15:57:54 -0000      1.55
+++ KeySet.cxx  10 Mar 2005 16:30:40 -0000      1.56
@@ -265,11 +265,12 @@
                        aFilter += aAnd;
        }
 
-       ::rtl::OUString sOldFilter = m_xComposer->getFilter();
-       Reference<XSingleSelectQueryComposer> xQu(m_xComposer,UNO_QUERY);
-       xQu->setFilter(aFilter);
-       m_xStatement = m_xConnection->prepareStatement(m_xComposer->getQuery());
-       xQu->setFilter(sOldFilter);
+       Reference< XMultiServiceFactory >  xFactory(m_xConnection, 
UNO_QUERY_THROW);
+       Reference<XSingleSelectQueryComposer> 
xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
+       xAnalyzer->setQuery(m_xComposer->getQuery());
+       xAnalyzer->setFilter(aFilter);
+       m_xStatement = m_xConnection->prepareStatement(xAnalyzer->getQuery());
+       ::comphelper::disposeComponent(xAnalyzer);
 }
 // -------------------------------------------------------------------------
 Any SAL_CALL OKeySet::getBookmark( const ORowSetRow& _rRow ) 
throw(SQLException, RuntimeException)




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to