diff options
Diffstat (limited to 'connectivity/source/inc/odbc')
| -rw-r--r-- | connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 10 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OResultSet.hxx | 10 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OStatement.hxx | 7 |
3 files changed, 16 insertions, 11 deletions
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 2364e05c2578..de4c53e79f5f 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ODatabaseMetaDataResultSet.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-05-15 08:18:15 $ + * last change: $Author: oj $ $Date: 2001-05-17 06:46:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,6 @@ namespace connectivity public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::std::vector<void*> m_aBindVector; ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; @@ -153,11 +152,9 @@ namespace connectivity 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; - sal_Bool m_bInserting; sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -194,10 +191,11 @@ namespace connectivity ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + ~ODatabaseMetaDataResultSet(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSet(OConnection* _pConnection,SQLHANDLE _pStatementHandle,rtl_TextEncoding _nTextEncoding); - ~ODatabaseMetaDataResultSet(); + inline void* getOdbcFunction(sal_Int32 _nIndex) const { diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 54534cdd05c8..62634308675b 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -2,9 +2,9 @@ * * $RCSfile: OResultSet.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: oj $ $Date: 2001-05-15 08:18:15 $ + * last change: $Author: oj $ $Date: 2001-05-17 06:46:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,6 +133,10 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + typedef sal_Int64 TVoidPtr; + typedef ::std::allocator< TVoidPtr > TVoidAlloc; + typedef ::std::vector<TVoidPtr> TVoidVector; + // typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector; class OResultSet : public comphelper::OBaseMutex, public OResultSet_BASE, @@ -140,7 +144,7 @@ namespace connectivity public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - ::std::vector<void*> m_aBindVector; + TVoidVector m_aBindVector; ::std::vector<sal_Int32> m_aLengthVector; ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::vector< ::com::sun::star::uno::Any> m_aRow; // only used when SQLGetData can't be called in any order diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 17a7f32a4e30..874ee59eabea 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -2,9 +2,9 @@ * * $RCSfile: OStatement.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: oj $ $Date: 2001-05-15 08:18:15 $ + * last change: $Author: oj $ $Date: 2001-05-17 06:46:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,6 +195,7 @@ namespace connectivity ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + ~OStatement_Base(){} public: ::cppu::OBroadcastHelper& rBHelper; OStatement_Base(OConnection* _pConnection ); @@ -256,6 +257,8 @@ namespace connectivity public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo { + protected: + ~OStatement(){} public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){} |