diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-21 08:56:05 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-21 08:56:51 +0200 |
| commit | 08a943fc379c5f8af25128c935e93e6a9d82d136 (patch) | |
| tree | 3a2e8dd41f7d52985630c168f60d98bdff375c04 /connectivity | |
| parent | 4592d27dca75e73218ddca2039b1a1332adc828c (diff) | |
Get rid of trivial comphelper::query_interface wrapper
Change-Id: I2b9dafd2a34d055dcd8b8c4d894be30dc821d3be
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/ado/AStatement.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/drivers/odbc/OStatement.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 662daf4d1451..a6a893a4523d 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -21,7 +21,6 @@ #include "ado/AConnection.hxx" #include "ado/AResultSet.hxx" #include <comphelper/property.hxx> -#include <comphelper/uno3.hxx> #include <osl/thread.h> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> @@ -182,8 +181,9 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) try { - Reference<XCloseable> xCloseable; - if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) ) + Reference<XCloseable> xCloseable( + m_xResultSet.get(), css::uno::UNO_QUERY); + if ( xCloseable.is() ) xCloseable->close(); } catch( const DisposedException& ) { } diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 5df41972f75b..2259ca9e1be0 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -25,7 +25,6 @@ #include "odbc/OResultSet.hxx" #include <comphelper/property.hxx> #include "odbc/OTools.hxx" -#include <comphelper/uno3.hxx> #include <osl/thread.h> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> @@ -226,8 +225,9 @@ void OStatement_Base::clearMyResultSet() try { - Reference<XCloseable> xCloseable; - if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) ) + Reference<XCloseable> xCloseable( + m_xResultSet.get(), css::uno::UNO_QUERY); + if ( xCloseable.is() ) xCloseable->close(); } catch( const DisposedException& ) { } |