1 files changed, 8 insertions, 12 deletions
diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx
index 418c66a7d0cd..d135c4e4cda4 100644
--- a/connectivity/source/drivers/firebird/Statement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -40,7 +40,6 @@ using namespace com::sun::star::util;
 
 using namespace ::comphelper;
 using namespace ::osl;
-using namespace ::std;
 
 // ---- XBatchExecution - UNSUPPORTED ----------------------------------------
 void SAL_CALL OStatement::addBatch(const OUString&)
@@ -58,12 +57,12 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
 
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
 
-void SAL_CALL OStatement::acquire() throw()
+void SAL_CALL OStatement::acquire() noexcept
 {
     OStatementCommonBase::acquire();
 }
 
-void SAL_CALL OStatement::release() throw()
+void SAL_CALL OStatement::release() noexcept
 {
     OStatementCommonBase::release();
 }
@@ -71,7 +70,8 @@ void SAL_CALL OStatement::release() throw()
 void OStatement::disposeResultSet()
 {
     MutexGuard aGuard(m_aMutex);
-    checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+    if (OStatementCommonBase_Base::rBHelper.bDisposed)
+        return;
 
     OStatementCommonBase::disposeResultSet();
 
@@ -126,11 +126,6 @@ uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& s
     if (isDDLStatement())
     {
         m_pConnection->commit();
-        m_pConnection->notifyDatabaseModified();
-    }
-    else if (getStatementChangeCount() > 0)
-    {
-        m_pConnection->notifyDatabaseModified();
     }
 
     return m_xResultSet;
@@ -148,7 +143,7 @@ uno::Reference< XConnection > SAL_CALL OStatement::getConnection()
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
-    return uno::Reference<XConnection>(m_pConnection.get());
+    return m_pConnection;
 }
 
 Any SAL_CALL OStatement::queryInterface( const Type & rType )
@@ -172,4 +167,5 @@ void SAL_CALL OStatement::disposing()
     disposeResultSet();
     close();
 }
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */