[Libreoffice-commits] core.git: 2 commits - connectivity/source
Lionel Elie Mamane
lionel at mamane.lu
Mon Oct 6 10:40:53 PDT 2014
connectivity/source/drivers/ado/ACallableStatement.cxx | 12 ++++++++++++
connectivity/source/drivers/ado/APreparedStatement.cxx | 10 ++++++++++
connectivity/source/drivers/ado/AStatement.cxx | 15 +++++++++++++++
connectivity/source/inc/ado/ACallableStatement.hxx | 2 ++
connectivity/source/inc/ado/APreparedStatement.hxx | 2 ++
connectivity/source/inc/ado/AStatement.hxx | 3 +++
6 files changed, 44 insertions(+)
New commits:
commit 9de01eeba7ecc2df5546b5a64559fed90f29ffbb
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Oct 6 19:40:20 2014 +0200
Revert "ADO driver: don't override a virtual method just to call the one of the parent"
This reverts commit 220deb0a0ed7b3efa14088acdab0520709309105.
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 058a8bd..691408e 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -444,6 +444,16 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim
}
}
+void SAL_CALL OPreparedStatement::acquire() throw()
+{
+ OStatement_Base::acquire();
+}
+
+void SAL_CALL OPreparedStatement::release() throw()
+{
+ OStatement_Base::release();
+}
+
void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
const OUString& _sDefaultName,
sal_Int32& _rParameterCount)
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 8210f8a..3a46f1f 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -63,6 +63,8 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is needed:
OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql);
+ 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
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
commit bf9339718984fc88e3f1cd3174b61eda5c13933b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Oct 6 19:39:51 2014 +0200
Revert "ADO: don't override a virtual method to call the one of the parent"
This reverts commit fa8f2fdf45c168a25dd955ebd24780b4863d6cde.
Change-Id: I252e29648fb59a15379ba2f3b63d6914a7fc3a93
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index abc2fb3..8e0c510 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -210,4 +210,16 @@ 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 733db83..ad4244e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -817,6 +817,21 @@ 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 eabdc3c..02569ae 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -45,6 +45,8 @@ 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 6724e94..356a37a 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -140,6 +140,7 @@ 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
@@ -176,6 +177,8 @@ 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);
More information about the Libreoffice-commits
mailing list