diff options
Diffstat (limited to 'connectivity/source/inc/odbc')
| -rw-r--r-- | connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OPreparedStatement.hxx | 5 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OResultSet.hxx | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index b0dc5cec35db..4b151b2517ed 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -42,6 +42,7 @@ namespace connectivity::odbc { + class OResultSetMetaData; /* ** java_sql_ResultSet */ @@ -68,8 +69,7 @@ namespace connectivity::odbc SQLHANDLE m_aStatementHandle; // ... until freed css::uno::WeakReferenceHelper m_aStatement; - css::uno::Reference< css::sdbc::XResultSetMetaData> - m_xMetaData; + rtl::Reference<OResultSetMetaData> m_xMetaData; std::unique_ptr<SQLUSMALLINT[]> m_pRowStatusArray; rtl::Reference<OConnection> m_pConnection; rtl_TextEncoding m_nTextEncoding; diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index aa5e895bfc79..348c355453e6 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -30,7 +30,7 @@ namespace connectivity::odbc { - + class OResultSetMetaData; class OBoundParam; typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, css::sdbc::XParameters, @@ -51,7 +51,7 @@ namespace connectivity::odbc std::unique_ptr<OBoundParam[]> boundParams; // Array of bound parameter objects. Each parameter marker will have a // corresponding object to hold bind information, and resulting data. - css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; + rtl::Reference<OResultSetMetaData> m_xMetaData; bool m_bPrepared; void FreeParams(); @@ -137,6 +137,7 @@ namespace connectivity::odbc virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; + const rtl::Reference< OResultSetMetaData > & getMetaDataImpl(); public: using OStatement_Base::executeQuery; diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 5c8328082904..c7638a18d8b9 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -40,9 +40,11 @@ #include <connectivity/FValue.hxx> #include <TSkipDeletedSet.hxx> #include <memory> +#include "OResultSetMetaData.hxx" namespace connectivity::odbc { + class OResultSetMetaData; /* ** java_sql_ResultSet @@ -132,7 +134,7 @@ namespace connectivity::odbc OStatement_Base* m_pStatement; std::unique_ptr<OSkipDeletedSet> m_pSkipDeletedSet; css::uno::Reference< css::uno::XInterface> m_xStatement; - css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; + rtl::Reference< OResultSetMetaData> m_xMetaData; std::unique_ptr<SQLUSMALLINT[]> m_pRowStatusArray; rtl_TextEncoding m_nTextEncoding; sal_Int32 m_nRowPos; @@ -235,7 +237,7 @@ namespace connectivity::odbc return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); } - void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} + void setMetaData(const rtl::Reference<OResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; |