User: obo     
Date: 2006/07/10 07:29:51

Modified:
   dba/connectivity/source/drivers/mozab/MResultSet.hxx

Log:
 INTEGRATION: CWS qiq (1.11.26); FILE MERGED
 2006/06/27 14:40:47 fs 1.11.26.2: RESYNC: (1.11-1.12); FILE MERGED
 2006/05/10 10:52:23 fs 1.11.26.1: #i51443# changed API of the OSQLParseIterator

File Changes:

Directory: /dba/connectivity/source/drivers/mozab/
==================================================

File [changed]: MResultSet.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MResultSet.hxx?r1=1.12&r2=1.13
Delta lines:  +21 -21
---------------------
--- MResultSet.hxx      20 Jun 2006 01:44:30 -0000      1.12
+++ MResultSet.hxx      10 Jul 2006 14:29:48 -0000      1.13
@@ -137,7 +137,8 @@
 
 
 
-            connectivity::OSQLParseTreeIterator&        m_aSQLIterator;
+            ::boost::shared_ptr< ::connectivity::OSQLParseTreeIterator >
+                                                        m_pSQLIterator;
             const connectivity::OSQLParseNode*          m_pParseTree;
 
                        // OPropertyArrayUsageHelper
@@ -166,7 +167,7 @@
                public:
                        DECLARE_SERVICE_INFO();
 
-            OResultSet(OStatement_Base* pStmt, 
connectivity::OSQLParseTreeIterator&   _aSQLIterator );
+            OResultSet(OStatement_Base* pStmt, const ::boost::shared_ptr< 
::connectivity::OSQLParseTreeIterator >& _pSQLIterator );
 
 
                        ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface > operator *()
@@ -302,8 +303,7 @@
             void fillRowData() throw( ::com::sun::star::sdbc::SQLException );
             void initializeRow(OValueRow& _rRow,sal_Int32 _nColumnCount);
             void analyseWhereClause( const OSQLParseNode*                 
parseTree,
-                                     MQueryExpression                    
&queryExpression,
-                                     connectivity::OSQLParseTreeIterator& 
aSQLIterator);
+                                     MQueryExpression                    
&queryExpression);
 
             sal_Bool isCount() const;
 




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

Reply via email to