[Libreoffice-commits] .: connectivity/source

[Tor Lillqvist]

 connectivity/source/drivers/macab/MacabPreparedStatement.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2f45e42a1bd4ff4c781020301cbbb28e8b152903
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Apr 25 17:04:04 2012 +0300

    WaE: hides overloaded virtual function
    
    Use "using" declarations instead of a pragma. Gets rid of the warnings
    completely instead of making them non-errors in a -Werror compilation.

diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index c387587..bc1d733 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
@@ -36,10 +36,6 @@
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <cppuhelper/implbase4.hxx>
 
-#ifdef __clang__
-#pragma clang diagnostic warning "-Woverloaded-virtual"
-#endif
-
 namespace connectivity
 {
     namespace macab
@@ -82,6 +78,10 @@ namespace connectivity
             virtual void SAL_CALL disposing();
 
             // XPreparedStatement
+            using MacabCommonStatement::executeQuery;
+            using MacabCommonStatement::executeUpdate;
+            using MacabCommonStatement::execute;
+
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL executeUpdate(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL execute(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);