connectivity/source/drivers/ado/APreparedStatement.cxx | 27 ---------------
connectivity/source/drivers/mozab/MPreparedStatement.hxx | 1
connectivity/source/inc/ado/APreparedStatement.hxx | 11 +-----
3 files changed, 4 insertions(+), 35 deletions(-)
New commits:
commit f641fd1526159e4a0effc99776a495bfaa053a6e
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Tue Jun 17 17:39:19 2014 +0200
mozab driver: don't pretend to implement an interface one does not
Change-Id: I8ab2e2691ecf35e00283bd3144b2f4c8203adc3a
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 4ad1764..44134df 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -37,7 +37,6 @@ namespace connectivity
typedef ::cppu::ImplHelper5<
::com::sun::star::sdbc::XPreparedStatement,
::com::sun::star::sdbc::XParameters,
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
-
::com::sun::star::sdbc::XMultipleResults,
::com::sun::star::lang::XServiceInfo>
OPreparedStatement_BASE;
class OPreparedStatement : public OCommonStatement,
commit 220deb0a0ed7b3efa14088acdab0520709309105
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Mon Jun 16 18:50:00 2014 +0200
ADO driver: don't override a virtual method just to call the one of the
parent
Change-Id: I39020452e8ff4b17b0c1cfb9ff54bf650ab97fc3
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 691408e..058a8bd 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -444,16 +444,6 @@ 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 3a46f1f..8210f8a 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -63,8 +63,6 @@ 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 4f1787a5283876857dff391c827e7b454000ba0a
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Mon Jun 16 18:49:16 2014 +0200
ADO driver: don't pretend to implement an interface one does not
Change-Id: I6234974cfc1b7650a35b8f7b9a4132acf797c91b
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index c862d05..691408e 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -98,7 +98,6 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type &
rType ) throw(Runt
return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType,
static_cast<
XPreparedStatement*>(this),
static_cast< XParameters*>(this),
- static_cast<
XPreparedBatchExecution*>(this),
static_cast<
XResultSetMetaDataSupplier*>(this));
}
@@ -106,8 +105,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type
& rType ) throw(Runt
{
::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
cppu::UnoType<XParameters>::get(),
-
cppu::UnoType<XResultSetMetaDataSupplier>::get(),
-
cppu::UnoType<XPreparedBatchExecution>::get());
+
cppu::UnoType<XResultSetMetaDataSupplier>::get());
return
::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes());
}
@@ -446,19 +444,6 @@ void SAL_CALL OPreparedStatement::clearParameters( )
throw(SQLException, Runtim
}
}
-void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException,
RuntimeException)
-{
-}
-
-void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException,
RuntimeException)
-{
-}
-
-Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( )
throw(SQLException, RuntimeException)
-{
- return Sequence< sal_Int32 > ();
-}
-
void SAL_CALL OPreparedStatement::acquire() throw()
{
OStatement_Base::acquire();
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx
b/connectivity/source/inc/ado/APreparedStatement.hxx
index 40b5ddf..3a46f1f 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -24,10 +24,12 @@
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+// TODO: implement ::com::sun::star::sdbc::XPreparedBatchExecution
+// (empty implementations removed on 2014-06-16)
+
namespace connectivity
{
class OSQLParseNode;
@@ -37,7 +39,6 @@ namespace connectivity
class OPreparedStatement : public OStatement_Base,
public
::com::sun::star::sdbc::XPreparedStatement,
public
::com::sun::star::sdbc::XParameters,
- public
::com::sun::star::sdbc::XPreparedBatchExecution,
public
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
public
::com::sun::star::lang::XServiceInfo
@@ -97,10 +98,6 @@ namespace connectivity
virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clearParameters( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- // XPreparedBatchExecution
- virtual void SAL_CALL addBatch( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL clearBatch( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
executeBatch( ) throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
// XCloseable
virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
// XResultSetMetaDataSupplier
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
