Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:28:28 Modified: dba/connectivity/source/inc/odbc/OResultSet.hxx
Log: RESYNC: (1.25-1.26); FILE MERGED File Changes: Directory: /dba/connectivity/source/inc/odbc/ ============================================= File [changed]: OResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/odbc/OResultSet.hxx?r1=1.25.42.1&r2=1.25.42.2 Delta lines: +7 -6 ------------------- --- OResultSet.hxx 22 Mar 2006 11:10:25 -0000 1.25.42.1 +++ OResultSet.hxx 4 Jul 2006 08:28:25 -0000 1.25.42.2 @@ -128,7 +128,6 @@ sal_Int32 nCount = _rLH.getLength(); if(nCount != 4) { - const sal_Int8* pLH = _rLH.getConstArray(); const sal_Int8* pLHBack = _rLH.getConstArray() + nCount - 1; const sal_Int8* pRHBack = _rRH.getConstArray() + nCount - 1; @@ -186,7 +185,6 @@ sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are SQLRETURN m_nCurrentFetchState; sal_Bool m_bWasNull; - sal_Bool m_bBOF; // before first record sal_Bool m_bEOF; // after last record sal_Bool m_bLastRecord; sal_Bool m_bFreeHandle; @@ -245,7 +243,7 @@ void construct(); - inline void* getOdbcFunction(sal_Int32 _nIndex) const + inline oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const { return m_pStatement->getOdbcFunction(_nIndex); } @@ -359,6 +357,9 @@ virtual sal_Int32 getDriverPos() const; virtual sal_Bool deletedVisible() const; virtual sal_Bool isRowDeleted() const; + + protected: + using OPropertySetHelper::getFastPropertyValue; }; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
