diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:29:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 13:29:48 +0000 |
| commit | 59c2ec48c1b35778739f464be0089b66ecd1d1cf (patch) | |
| tree | 96a884934d9fe06883f280b2aad89ce55a377e58 | |
| parent | 739d0a7028e7684f281617a395c154bb8ea4d7f6 (diff) | |
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
| -rw-r--r-- | connectivity/source/drivers/mozab/MResultSet.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index bc5ea4000473..f9f93fea211b 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -4,9 +4,9 @@ * * $RCSfile: MResultSet.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2006-06-20 01:44:30 $ + * last change: $Author: obo $ $Date: 2006-07-10 14:29:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,7 +137,8 @@ namespace connectivity - connectivity::OSQLParseTreeIterator& m_aSQLIterator; + ::boost::shared_ptr< ::connectivity::OSQLParseTreeIterator > + m_pSQLIterator; const connectivity::OSQLParseNode* m_pParseTree; // OPropertyArrayUsageHelper @@ -166,7 +167,7 @@ namespace connectivity 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 *() @@ -289,8 +290,8 @@ protected: sal_Bool m_bIsAlwaysFalseQuery; ::vos::ORef<OKeySet> m_pKeySet; OSortIndex* m_pSortIndex; - sal_Int32 m_nNewRow; //inserted row - sal_Int32 m_nUpdatedRow; //updated row + sal_Int32 m_nNewRow; //inserted row + sal_Int32 m_nUpdatedRow; //updated row sal_Int32 m_RowStates; sal_Int32 m_bIsReadOnly; inline void resetParameters() { m_nParamIndex = 0; } @@ -302,8 +303,7 @@ protected: 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; |