connectivity/source/drivers/ado/ACallableStatement.cxx | 12 ------------ connectivity/source/drivers/ado/AStatement.cxx | 15 --------------- connectivity/source/inc/ado/ACallableStatement.hxx | 2 -- connectivity/source/inc/ado/AStatement.hxx | 3 --- 4 files changed, 32 deletions(-)
New commits: commit fa8f2fdf45c168a25dd955ebd24780b4863d6cde Author: Lionel Elie Mamane <lio...@mamane.lu> Date: Mon Oct 6 19:20:37 2014 +0200 ADO: don't override a virtual method just to call the one of the parent Change-Id: Ibae309ffbb7b2500c9113a95ca3fc508de378976 diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 8e0c510..abc2fb3 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -210,16 +210,4 @@ Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/ } -void SAL_CALL OCallableStatement::acquire() throw() -{ - OPreparedStatement::acquire(); -} - -void SAL_CALL OCallableStatement::release() throw() -{ - OPreparedStatement::release(); -} - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index ad4244e..733db83 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -817,21 +817,6 @@ OStatement::~OStatement() } IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement"); -void SAL_CALL OStatement_Base::acquire() throw() -{ - OStatement_BASE::acquire(); -} - -void SAL_CALL OStatement::acquire() throw() -{ - OStatement_Base::acquire(); -} - -void SAL_CALL OStatement::release() throw() -{ - OStatement_Base::release(); -} - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index 02569ae..eabdc3c 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.hxx @@ -45,8 +45,6 @@ namespace connectivity OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql ); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 356a37a..6724e94 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -140,7 +140,6 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); //XTypeProvider @@ -177,8 +176,6 @@ namespace connectivity DECLARE_SERVICE_INFO(); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // XBatchExecution virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits