[Libreoffice-commits] core.git: connectivity/source

Chris Sherlock chris.sherlock79 at gmail.com
Thu Feb 1 14:31:49 UTC 2018


 connectivity/source/drivers/firebird/ResultSet.cxx |   16 ----------------
 connectivity/source/drivers/firebird/ResultSet.hxx |   10 ----------
 2 files changed, 26 deletions(-)

New commits:
commit 192b2f754cc4f05d84e7da0d18bfa88f21329c15
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sat Jan 6 14:25:13 2018 +1100

    connectivity: remove dead code
    
    Change-Id: Ia968179d90978dc6c737effce5447efda60c1f66
    Reviewed-on: https://gerrit.libreoffice.org/47490
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index 2d440097151e..ed46ecdbad6a 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -841,22 +841,6 @@ void SAL_CALL OResultSet::cancel(  )
 
 }
 
-//----- XWarningsSupplier UNSUPPORTED -----------------------------------------
-#if 0
-void SAL_CALL OResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception)
-{
-    ::dbtools::throwFunctionNotSupportedSQLException("clearWarnings not supported in firebird",
-                                                  *this);
-}
-
-Any SAL_CALL OResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception)
-{
-    ::dbtools::throwFunctionNotSupportedSQLException("getWarnings not supported in firebird",
-                                                  *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 a7142451c54b..aa7d2083c762 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -39,9 +39,6 @@
 #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
 {
@@ -54,9 +51,6 @@ namespace connectivity
                                                        css::sdbc::XRow,
                                                        css::sdbc::XResultSetMetaDataSupplier,
                                                        css::util::XCancellable,
-#if 0
-                                                       css::sdbc::XWarningsSupplier,
-#endif
                                                        css::sdbc::XCloseable,
                                                        css::sdbc::XColumnLocate,
                                                        css::lang::XServiceInfo> OResultSet_BASE;
@@ -188,10 +182,6 @@ namespace connectivity
             // XCloseable
             virtual void SAL_CALL close(  ) override;
             // XWarningsSupplier
-#if 0
-            virtual css::uno::Any SAL_CALL getWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-            virtual void SAL_CALL clearWarnings(  ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-#endif
 
             // XColumnLocate
             virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override;


More information about the Libreoffice-commits mailing list