Remove unsupporte XRowUpdate/XResultSetUpdate. (firebird-sdbc)

Change-Id: I3b9f8c7199e66f90e1573069996962294793d95e

2 files changed, 2 insertions, 268 deletions

diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index aac66220ed22..a86afafbf659 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -629,181 +629,7 @@ Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// ---- XResultSetUpdate - UNSUPPORTED ---------------------------------------
-void SAL_CALL OResultSet::insertRow() throw(SQLException, RuntimeException)
-{
-    throwFunctionNotSupportedException("XResultSetUpdate::insertRow", *this);
-}
-
-void SAL_CALL OResultSet::updateRow() throw(SQLException, RuntimeException)
-{
-    throwFunctionNotSupportedException("XResultSetUpdate::updateRow", *this);
-}
-
-void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException)
-{
-    throwFunctionNotSupportedException("XResultSetUpdate::deleteRow", *this);
-}
-
-void SAL_CALL OResultSet::cancelRowUpdates() throw(SQLException, RuntimeException)
-{
-    throwFunctionNotSupportedException("XResultSetUpdate::cancelRowUpdates", *this);
-}
-
-void SAL_CALL OResultSet::moveToInsertRow() throw(SQLException, RuntimeException)
-{
-    throwFunctionNotSupportedException("XResultSetUpdate::moveToInsertRow", *this);
-}
-
-void SAL_CALL OResultSet::moveToCurrentRow() throw(SQLException, RuntimeException)
-{
-    throwFunctionNotSupportedException("XResultSetUpdate::moveToCurrentRow", *this);
-}
 
-// ---- XRowUpdate - UNSUPPORTED ---------------------------------------------
-void SAL_CALL OResultSet::updateNull(sal_Int32 columnIndex)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    throwFunctionNotSupportedException("XRowUpdate::updateNull", *this);
-}
-
-void SAL_CALL OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateBoolean", *this);
-}
-
-void SAL_CALL OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateByte", *this);
-}
-
-void SAL_CALL OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateShort", *this);
-}
-
-void SAL_CALL OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateInt", *this);
-}
-
-void SAL_CALL OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateLong", *this);
-}
-
-void SAL_CALL OResultSet::updateFloat(sal_Int32 columnIndex, float x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateFloat", *this);
-}
-
-void SAL_CALL OResultSet::updateDouble(sal_Int32 columnIndex, double x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateDouble", *this);
-}
-
-void SAL_CALL OResultSet::updateString(sal_Int32 columnIndex, const OUString& x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateString", *this);
-}
-
-void SAL_CALL OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateBytes", *this);
-}
-
-void SAL_CALL OResultSet::updateDate(sal_Int32 columnIndex, const Date& x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateDate", *this);
-}
-
-void SAL_CALL OResultSet::updateTime(sal_Int32 columnIndex, const Time& x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateTime", *this);
-}
-
-void SAL_CALL OResultSet::updateTimestamp(sal_Int32 columnIndex, const DateTime& x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateTimeStamp", *this);
-}
-
-void SAL_CALL OResultSet::updateBinaryStream(sal_Int32 columnIndex,
-                                             const uno::Reference< XInputStream >& x,
-                                             sal_Int32 length)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    (void) length;
-    throwFunctionNotSupportedException("XRowUpdate::updateBinaryStream", *this);
-}
-
-void SAL_CALL OResultSet::updateCharacterStream(sal_Int32 columnIndex,
-                                                const uno::Reference< XInputStream >& x,
-                                                sal_Int32 length)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    (void) length;
-    throwFunctionNotSupportedException("XRowUpdate::updateCharacterStream", *this);
-}
-
-void SAL_CALL OResultSet::updateObject(sal_Int32 columnIndex, const Any& x)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    throwFunctionNotSupportedException("XRowUpdate::updateObject", *this);
-}
-
-void SAL_CALL OResultSet::updateNumericObject(sal_Int32 columnIndex,
-                                              const Any& x,
-                                              sal_Int32 scale)
-    throw(SQLException, RuntimeException)
-{
-    (void) columnIndex;
-    (void) x;
-    (void) scale;
-    throwFunctionNotSupportedException("XRowUpdate::updateNumericObject", *this);
-}
 // -------------------------------------------------------------------------
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index 6cfec8d7606a..5f05cde3d1b1 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -25,7 +25,7 @@
 #include <ibase.h>
 
 #include <connectivity/OSubComponent.hxx>
-#include <cppuhelper/compbase12.hxx>
+#include <cppuhelper/compbase10.hxx>
 
 #include <com/sun/star/util/XCancellable.hpp>
 #include <com/sun/star/sdbc/XCloseable.hpp>
@@ -47,13 +47,11 @@ namespace connectivity
         /*
         **  OResultSet
         */
-        typedef ::cppu::WeakComponentImplHelper12<      ::com::sun::star::sdbc::XResultSet,
+        typedef ::cppu::WeakComponentImplHelper10<      ::com::sun::star::sdbc::XResultSet,
                                                         ::com::sun::star::sdbc::XRow,
                                                         ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
                                                         ::com::sun::star::util::XCancellable,
                                                         ::com::sun::star::sdbc::XWarningsSupplier,
-                                                        ::com::sun::star::sdbc::XResultSetUpdate,
-                                                        ::com::sun::star::sdbc::XRowUpdate,
                                                         ::com::sun::star::sdbcx::XRowLocate,
                                                         ::com::sun::star::sdbcx::XDeleteRows,
                                                         ::com::sun::star::sdbc::XCloseable,
@@ -195,96 +193,6 @@ namespace connectivity
             virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-            // XResultSetUpdate - UNSUPPORTED
-            virtual void SAL_CALL insertRow()
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateRow()
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL deleteRow()
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL cancelRowUpdates()
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL moveToInsertRow()
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL moveToCurrentRow()
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-
-            // XRowUpdate - UNSUPPORTED
-            virtual void SAL_CALL updateNull(sal_Int32 columnIndex)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateBoolean(sal_Int32 columnIndex,
-                                                sal_Bool x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateByte(sal_Int32 columnIndex,
-                                             sal_Int8 x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateShort(sal_Int32 columnIndex,
-                                              sal_Int16 x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateInt(sal_Int32 columnIndex,
-                                            sal_Int32 x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateLong(sal_Int32 columnIndex,
-                                             sal_Int64 x )
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateFloat(sal_Int32 columnIndex,
-                                              float x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateDouble(sal_Int32 columnIndex,
-                                               double x )
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateString(sal_Int32 columnIndex,
-                                               const ::rtl::OUString& x )
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateBytes(sal_Int32 columnIndex,
-                                              const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateDate(sal_Int32 columnIndex,
-                                             const ::com::sun::star::util::Date& x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateTime(sal_Int32 columnIndex,
-                                             const ::com::sun::star::util::Time& x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateTimestamp(sal_Int32 columnIndex,
-                                                  const ::com::sun::star::util::DateTime& x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateBinaryStream(sal_Int32 columnIndex,
-                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,
-                                                     sal_Int32 length)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateCharacterStream(sal_Int32 columnIndex,
-                                                        const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,
-                                                        sal_Int32 length)
-                throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateObject(sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x)
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateNumericObject(sal_Int32 columnIndex,
-                                                      const ::com::sun::star::uno::Any& x,
-                                                      sal_Int32 scale )
-                throw(::com::sun::star::sdbc::SQLException,
-                      ::com::sun::star::uno::RuntimeException);
-
             // XColumnLocate
             virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName)
                 throw(::com::sun::star::sdbc::SQLException,