diff options
Diffstat (limited to 'connectivity/source/inc')
7 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx index 1ea9708e5a27..7a078c346805 100644 --- a/connectivity/source/inc/OSubComponent.hxx +++ b/connectivity/source/inc/OSubComponent.hxx @@ -78,7 +78,7 @@ namespace connectivity { // avoid ambiguity ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex ); - m_xParent = NULL; + m_xParent.clear(); } void relase_ChildImpl() { diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx index 14503c92fd46..ef1501d60e81 100644 --- a/connectivity/source/inc/adabas/BPreparedStatement.hxx +++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx @@ -46,7 +46,7 @@ namespace connectivity virtual void setResultSetType(sal_Int32 _par0) ; virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; public: - OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::std::vector<OTypeInfo>& _TypeInfo,const ::rtl::OUString& sql); + OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql); }; } } diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index 4f90b8afaee3..1cf65042897d 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -87,7 +87,7 @@ namespace connectivity } ~ODocHolder() { - m_xDoc = NULL; + m_xDoc.clear(); m_pConnection->releaseDoc(); } ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument> getDoc() const { return m_xDoc; } diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 4f70dcfe0634..c0144313ae1a 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -89,12 +89,11 @@ namespace connectivity sal_Bool m_bParameterSubstitution; sal_Bool m_bIgnoreDriverPrivileges; sal_Bool m_bPreventGetVersionColumns; // #i60273# + sal_Bool m_bReadOnly; SQLRETURN OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); - void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); - virtual OConnection* cloneConnection(); // creates a new connection public: @@ -154,6 +153,9 @@ namespace connectivity SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE void freeStatementHandle(SQLHANDLE& _pHandle); + + void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); + const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } }; } } diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index e077fafe1b27..6248417828ba 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -76,6 +76,7 @@ namespace connectivity ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange; ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange; + ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; SQLHANDLE m_aStatementHandle; SQLHANDLE m_aConnectionHandle; diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index c9d8ff272163..9e6f6ca8a61f 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -73,10 +73,6 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - TTypeInfoVector m_aTypeInfo; // Hashtable containing an entry - // for each row returned by - // DatabaseMetaData.getTypeInfo. - SQLSMALLINT numParams; // Number of parameter markers // for the prepared statement @@ -119,7 +115,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OPreparedStatement( OConnection* _pConnection,const TTypeInfoVector& _TypeInfo,const ::rtl::OUString& sql); + OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString& sql); //XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index fdf0ed93b0a4..1d9564e5d762 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -54,6 +54,7 @@ namespace connectivity { protected: ::std::vector<sal_Int32> m_vMapping; // when not every column is needed + ::std::map<sal_Int32,sal_Int32> m_aColumnTypes; SQLHANDLE m_aStatementHandle; OConnection* m_pConnection; |