connectivity/source/drivers/firebird/ResultSet.cxx | 2 ++
connectivity/source/drivers/firebird/ResultSet.hxx | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit d2d2136f3f1ecfa03713ff4231ad6214ca6a9c33
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Sat May 31 05:44:16 2014 +0200
fdo#73352 firebird don't claim to support interfaces one doesn't
and then throw an exception when the interface is used
Change-Id: Id5e2c852323d49f51ab55cf46ab54223cf8ccf03
Reviewed-on: https://gerrit.libreoffice.org/9590
Reviewed-by: Lionel Elie Mamane <lio...@mamane.lu>
Tested-by: Lionel Elie Mamane <lio...@mamane.lu>
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 22d6013..4f8cc5d 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -756,6 +756,7 @@ void SAL_CALL OResultSet::cancel( )
throw(RuntimeException, std::exception)
}
//----- XWarningsSupplier UNSUPPORTED -----------------------------------------
+#if 0
void SAL_CALL OResultSet::clearWarnings() throw(SQLException,
RuntimeException, std::exception)
{
::dbtools::throwFunctionNotSupportedException("clearWarnings not supported
in firebird",
@@ -768,6 +769,7 @@ Any SAL_CALL OResultSet::getWarnings() throw(SQLException,
RuntimeException, std
*this);
return Any();
}
+#endif
//----- OIdPropertyArrayUsageHelper ------------------------------------------
IPropertyArrayHelper* OResultSet::createArrayHelper() const
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx
b/connectivity/source/drivers/firebird/ResultSet.hxx
index c8048d3..90c2b9f 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -26,7 +26,7 @@
#include <connectivity/FValue.hxx>
#include <connectivity/OSubComponent.hxx>
-#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/compbase7.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
@@ -39,7 +39,9 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
+#if 0
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#endif
namespace connectivity
{
@@ -48,11 +50,13 @@ namespace connectivity
/*
** OResultSet
*/
- typedef ::cppu::WeakComponentImplHelper8<
::com::sun::star::sdbc::XResultSet,
+ typedef ::cppu::WeakComponentImplHelper7<
::com::sun::star::sdbc::XResultSet,
::com::sun::star::sdbc::XRow,
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
::com::sun::star::util::XCancellable,
+#if 0
::com::sun::star::sdbc::XWarningsSupplier,
+#endif
::com::sun::star::sdbc::XCloseable,
::com::sun::star::sdbc::XColumnLocate,
::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
@@ -185,8 +189,10 @@ namespace connectivity
// XCloseable
virtual void SAL_CALL close( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XWarningsSupplier
+#if 0
virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL clearWarnings( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+#endif
// XColumnLocate
virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString&
columnName)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
