Remove unnecessary OStatement_BASE2 (firebird-sdbc).

Seemingly a relic from the skeleton driver?

Change-Id: I7c5ba9763daee51b1c8b23f614e3d9501858a29c

4 files changed, 11 insertions, 62 deletions

diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
index b4ab043aba6b..2e66504339df 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.cxx
@@ -72,7 +72,7 @@ IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.firebird.PreparedS
 OPreparedStatement::OPreparedStatement( OConnection* _pConnection,
                                         const TTypeInfoVector& _TypeInfo,
                                         const OUString& sql)
-    :OStatement_BASE2(_pConnection)
+    :OStatement_Base(_pConnection)
     ,m_aTypeInfo(_TypeInfo)
     ,m_sSqlStatement(sql)
     ,m_statementHandle(0)
@@ -161,18 +161,18 @@ OPreparedStatement::~OPreparedStatement()
 
 void SAL_CALL OPreparedStatement::acquire() throw()
 {
-    OStatement_BASE2::acquire();
+    OStatement_Base::acquire();
 }
 
 void SAL_CALL OPreparedStatement::release() throw()
 {
-    OStatement_BASE2::release();
+    OStatement_Base::release();
 }
 
 Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType)
     throw(RuntimeException)
 {
-    Any aRet = OStatement_BASE2::queryInterface(rType);
+    Any aRet = OStatement_Base::queryInterface(rType);
     if(!aRet.hasValue())
         aRet = OPreparedStatement_BASE::queryInterface(rType);
     return aRet;
@@ -181,8 +181,7 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType)
 uno::Sequence< Type > SAL_CALL OPreparedStatement::getTypes()
     throw(RuntimeException)
 {
-    return concatSequences(OPreparedStatement_BASE::getTypes(),
-                           OStatement_BASE2::getTypes());
+    return OPreparedStatement_BASE::getTypes();
 }
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
@@ -210,7 +209,7 @@ void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException)
         // TODO: implement
     }
 
-    OStatement_BASE2::close();
+    OStatement_Base::close();
 }
 
 sal_Bool SAL_CALL OPreparedStatement::execute()
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.hxx b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
index da09df1125cc..75dd18fbf93b 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/FPreparedStatement.hxx
@@ -56,7 +56,7 @@ namespace connectivity
                                         ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
                                         ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE;
 
-        class OPreparedStatement :  public  OStatement_BASE2,
+        class OPreparedStatement :  public  OStatement_Base,
                                     public  OPreparedStatement_BASE
         {
         protected:
diff --git a/connectivity/source/drivers/firebird/FStatement.cxx b/connectivity/source/drivers/firebird/FStatement.cxx
index c2207004437e..c58db4438267 100644
--- a/connectivity/source/drivers/firebird/FStatement.cxx
+++ b/connectivity/source/drivers/firebird/FStatement.cxx
@@ -98,39 +98,6 @@ void OStatement_Base::disposeResultSet()
 //     m_xResultSet = uno::Reference< XResultSet>();
 }
 
-void OStatement_BASE2::disposing()
-{
-    MutexGuard aGuard(m_pConnection->getMutex());
-
-    disposeResultSet();
-
-    if (m_pConnection)
-        m_pConnection->release();
-    m_pConnection = NULL;
-
-//     if (NULL != m_OUTsqlda)
-//     {
-//         int i;
-//         XSQLVAR *var;
-//         for (i=0, var = m_OUTsqlda->sqlvar; i < m_OUTsqlda->sqld; i++, var++)
-//             free(var->sqldata);
-//         free(m_OUTsqlda);
-//         m_OUTsqlda = NULL;
-//     }
-//     if (NULL != m_INsqlda)
-//     {
-//         free(m_INsqlda);
-//         m_INsqlda = NULL;
-//     }
-
-    dispose_ChildImpl();
-    OStatement_Base::disposing();
-}
-//-----------------------------------------------------------------------------
-void SAL_CALL OStatement_BASE2::release() throw()
-{
-    relase_ChildImpl();
-}
 //-----------------------------------------------------------------------------
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
@@ -537,12 +504,12 @@ void SAL_CALL OStatement_Base::release() throw()
 
 void SAL_CALL OStatement::acquire() throw()
 {
-    OStatement_BASE2::acquire();
+    OStatement_Base::acquire();
 }
 
 void SAL_CALL OStatement::release() throw()
 {
-    OStatement_BASE2::release();
+    OStatement_Base::release();
 }
 
 uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/firebird/FStatement.hxx b/connectivity/source/drivers/firebird/FStatement.hxx
index 408e671972c2..584afa9b45c8 100644
--- a/connectivity/source/drivers/firebird/FStatement.hxx
+++ b/connectivity/source/drivers/firebird/FStatement.hxx
@@ -147,24 +147,7 @@ namespace connectivity
 
         };
 
-        class OStatement_BASE2  :public OStatement_Base
-                                ,public OSubComponent<OStatement_BASE2, OStatement_BASE>
-
-        {
-            friend class OSubComponent<OStatement_BASE2, OStatement_BASE>;
-        public:
-            OStatement_BASE2(OConnection* _pConnection)
-                : OStatement_Base(_pConnection),
-                  OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this)
-            {}
-
-            // OComponentHelper
-            virtual void SAL_CALL disposing(void);
-            // XInterface
-            virtual void SAL_CALL release() throw();
-        };
-
-        class OStatement :  public OStatement_BASE2,
+        class OStatement :  public OStatement_Base,
                             public ::com::sun::star::sdbc::XBatchExecution,
                             public ::com::sun::star::lang::XServiceInfo
         {
@@ -173,7 +156,7 @@ namespace connectivity
         public:
             // a constructor, which is required for returning objects:
             OStatement( OConnection* _pConnection)
-                : OStatement_BASE2( _pConnection)
+                : OStatement_Base( _pConnection)
             {}
 
             DECLARE_SERVICE_INFO();