User: hr      
Date: 06/06/19 19:06:43

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

Log:
 INTEGRATION: CWS warnings01 (1.22.30); FILE MERGED
 2005/11/21 10:08:00 fs 1.22.30.2: #i57457# warning-free code on unx*
 2005/11/07 14:44:10 fs 1.22.30.1: #i57457# warning-free code

File Changes:

Directory: /dba/connectivity/source/inc/odbc/
=============================================

File [changed]: OStatement.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/odbc/OStatement.hxx?r1=1.22&r2=1.23
Delta lines:  +7 -5
-------------------
--- OStatement.hxx      8 Sep 2005 07:37:55 -0000       1.22
+++ OStatement.hxx      20 Jun 2006 02:06:41 -0000      1.23
@@ -120,8 +120,8 @@
                        OConnection*                                    
m_pConnection;// The owning Connection object
                        SQLHANDLE                                               
m_aStatementHandle;
                        SQLUSMALLINT*                                   
m_pRowStatusArray;
+            ::cppu::OBroadcastHelper&       rBHelper;
 
-                       //using OStatement_BASE::rBHelper;
                protected:
 
                        sal_Int32 getQueryTimeOut()         const;
@@ -190,11 +190,10 @@
                        virtual ~OStatement_Base();
 
                public:
-                       ::cppu::OBroadcastHelper& rBHelper;
                        OStatement_Base(OConnection* _pConnection );
                        using OStatement_BASE::operator 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >;
 
-                       inline void* getOdbcFunction(sal_Int32 _nIndex)  const
+                       inline oslGenericFunction getOdbcFunction(sal_Int32 
_nIndex)  const
                        {
                                return m_pConnection->getOdbcFunction(_nIndex);
                        }
@@ -239,6 +238,9 @@
                                @return the cursor properties
                        */
                        SQLUINTEGER getCursorProperties(SQLINTEGER 
_nCursorType,sal_Bool bFirst);
+
+        protected:
+            using OPropertySetHelper::getFastPropertyValue;
                };
 
                class OStatement_BASE2  :public OStatement_Base




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

Reply via email to