diff options
Diffstat (limited to 'connectivity/source/drivers/firebird')
4 files changed, 9 insertions, 7 deletions
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index 42e540664dda..96f687c38123 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -33,7 +33,7 @@ namespace connectivity::firebird { - + class OResultSetMetaData; class OBoundParam; typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, css::sdbc::XParameters, @@ -46,7 +46,7 @@ namespace connectivity::firebird { protected: OUString m_sSqlStatement; - css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; + rtl::Reference<OResultSetMetaData> m_xMetaData; XSQLDA* m_pOutSqlda; XSQLDA* m_pInSqlda; diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index c80f5b8453d4..046be37c567a 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -39,6 +39,7 @@ namespace connectivity::firebird { + class OResultSetMetaData; /* ** OResultSet */ @@ -73,7 +74,7 @@ namespace connectivity::firebird ::osl::Mutex& m_rMutex; const css::uno::Reference< css::uno::XInterface >& m_xStatement; - css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; + rtl::Reference<OResultSetMetaData> m_xMetaData; XSQLDA* m_pSqlda; isc_stmt_handle m_statementHandle; diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 096c0ce436bd..12ce9a8fd7ba 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -19,6 +19,7 @@ #include "StatementCommonBase.hxx" #include "Util.hxx" +#include "ResultSet.hxx" #include <sal/log.hxx> #include <comphelper/sequence.hxx> @@ -62,9 +63,8 @@ OStatementCommonBase::~OStatementCommonBase() void OStatementCommonBase::disposeResultSet() { - uno::Reference< XComponent > xComp(m_xResultSet, UNO_QUERY); - if (xComp.is()) - xComp->dispose(); + if (m_xResultSet.is()) + m_xResultSet->dispose(); m_xResultSet.clear(); } diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index fa9cd790272e..92eac1ec521d 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -38,6 +38,7 @@ namespace connectivity::firebird { + class OResultSet; typedef ::cppu::WeakComponentImplHelper< css::sdbc::XWarningsSupplier, css::util::XCancellable, @@ -52,7 +53,7 @@ namespace connectivity::firebird protected: ::osl::Mutex m_aMutex; - css::uno::Reference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created + rtl::Reference<OResultSet> m_xResultSet; // The last ResultSet created // for this Statement ::rtl::Reference<Connection> m_pConnection; |