User: hr      
Date: 06/06/19 19:06:21

Modified:
 /dba/connectivity/source/inc/odbc/
  OResultSet.hxx

Log:
 INTEGRATION: CWS warnings01 (1.24.30); FILE MERGED
 2006/01/25 21:00:46 sb 1.24.30.3: RESYNC: (1.24-1.25); FILE MERGED
 2005/11/21 10:08:00 fs 1.24.30.2: #i57457# warning-free code on unx*
 2005/11/07 14:44:10 fs 1.24.30.1: #i57457# warning-free code

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&r2=1.26
Delta lines:  +4 -3
-------------------
--- OResultSet.hxx      3 Jan 2006 16:04:48 -0000       1.25
+++ OResultSet.hxx      20 Jun 2006 02:06:19 -0000      1.26
@@ -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;
@@ -246,7 +244,7 @@
 
                        void construct();
 
-                       inline void* getOdbcFunction(sal_Int32 _nIndex)  const
+                       inline oslGenericFunction getOdbcFunction(sal_Int32 
_nIndex)  const
                        {
                                return m_pStatement->getOdbcFunction(_nIndex);
                        }
@@ -360,6 +358,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]

Reply via email to