summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/evoab2
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/evoab2')
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx9
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.hxx6
-rw-r--r--connectivity/source/drivers/evoab2/NResultSet.hxx1
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.cxx4
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.hxx7
5 files changed, 2 insertions, 25 deletions
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index fa6fd275e5b6..2971992b9dc1 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -41,8 +41,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
OEvoabConnection::OEvoabConnection(OEvoabDriver& _rDriver)
- : OSubComponent<OEvoabConnection, OConnection_BASE>( static_cast<cppu::OWeakObject*>(&_rDriver), this )
- , m_rDriver(_rDriver)
+ : m_rDriver(_rDriver)
, m_eSDBCAddressType(SDBCAddress::EVO_LOCAL)
, m_xCatalog(nullptr)
{
@@ -59,11 +58,6 @@ OEvoabConnection::~OEvoabConnection()
}
-void SAL_CALL OEvoabConnection::release() throw()
-{
- release_ChildImpl();
-}
-
// XServiceInfo
IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection")
@@ -198,7 +192,6 @@ void OEvoabConnection::disposing()
// we noticed that we should be destroyed in near future so we have to dispose our statements
::osl::MutexGuard aGuard(m_aMutex);
OConnection_BASE::disposing();
- dispose_ChildImpl();
}
// -------------------------------- stubbed methods ------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 3156985020ae..b7860bce0a3d 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -23,7 +23,6 @@
#include "NDriver.hxx"
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <connectivity/OSubComponent.hxx>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <connectivity/CommonTools.hxx>
#include <connectivity/warningscontainer.hxx>
@@ -49,10 +48,7 @@ namespace connectivity
typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding
class OEvoabConnection :public OConnection_BASE
- ,public connectivity::OSubComponent<OEvoabConnection, OConnection_BASE>
{
- friend class connectivity::OSubComponent<OEvoabConnection, OConnection_BASE>;
-
private:
const OEvoabDriver& m_rDriver;
SDBCAddress::sdbc_address_type m_eSDBCAddressType;
@@ -78,8 +74,6 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing() override;
- // XInterface
- virtual void SAL_CALL release() throw() override;
// XServiceInfo
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index f1128a77bd7b..40b0027cfe48 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -40,7 +40,6 @@
#include <connectivity/FValue.hxx>
#include <connectivity/warningscontainer.hxx>
#include "NStatement.hxx"
-#include <connectivity/OSubComponent.hxx>
#include "NResultSetMetaData.hxx"
namespace connectivity
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 17643d55f045..d21f41c10e56 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -70,7 +70,6 @@ EBookQuery * createTest( const OUString &aColumnName,
OCommonStatement::OCommonStatement(OEvoabConnection* _pConnection)
: OCommonStatement_IBase(m_aMutex)
, ::comphelper::OPropertyContainer(OCommonStatement_IBase::rBHelper)
- , OStatement_CBase( static_cast<cppu::OWeakObject*>(_pConnection), this )
, m_xResultSet(nullptr)
, m_xConnection(_pConnection)
, m_aParser(_pConnection->getDriver().getComponentContext())
@@ -126,7 +125,6 @@ void OCommonStatement::disposing()
m_xConnection.clear();
- dispose_ChildImpl();
OCommonStatement_IBase::disposing();
}
@@ -532,7 +530,7 @@ void SAL_CALL OCommonStatement::acquire() throw()
void SAL_CALL OCommonStatement::release() throw()
{
- release_ChildImpl();
+ OCommonStatement_IBase::release();
}
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 65938fe47c9f..a2f918af0b9b 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -34,7 +34,6 @@
#include <connectivity/sqliterator.hxx>
#include <connectivity/sqlparse.hxx>
#include <connectivity/FValue.hxx>
-#include <connectivity/OSubComponent.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase.hxx>
#include <comphelper/propertycontainer.hxx>
@@ -147,17 +146,11 @@ namespace connectivity
//************ Class: OCommonStatement
// is a base class for the normal statement and for the prepared statement
- class OCommonStatement;
- typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase;
-
class OCommonStatement :public cppu::BaseMutex
,public OCommonStatement_IBase
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >
- ,public OStatement_CBase
{
- friend class OSubComponent< OCommonStatement, OCommonStatement_IBase >;
-
private:
css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created
rtl::Reference<OEvoabConnection> m_xConnection;