diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-01 13:54:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-02 11:21:36 +0100 |
| commit | 1b67ad6ff8979d8851db1223886bb03745845755 (patch) | |
| tree | f68fd6e34fcb3f1bb2b55b61e44cf0690a9f5f0a /connectivity/source/inc/odbc | |
| parent | e91aa231ee934b2f18b387f37a6e9017b05f2256 (diff) | |
remove connectivity OSubComponent
push the logic that is still necessary down into the subclasses
Change-Id: I99424f0b3c654c5652991a4140b17ceb02224e50
Reviewed-on: https://gerrit.libreoffice.org/49087
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/inc/odbc')
| -rw-r--r-- | connectivity/source/inc/odbc/OConnection.hxx | 6 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OStatement.hxx | 13 |
2 files changed, 4 insertions, 15 deletions
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index f9cd473b3b77..3cfda3792a8e 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <connectivity/odbc.hxx> #include <odbc/odbcbasedllapi.hxx> -#include <connectivity/OSubComponent.hxx> #include <connectivity/CommonTools.hxx> #include <TConnection.hxx> #include <OTypeInfo.hxx> @@ -46,11 +45,8 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE OConnection : public OConnection_BASE, - public connectivity::OSubComponent<OConnection, OConnection_BASE>, public OAutoRetrievingBase { - friend class connectivity::OSubComponent<OConnection, OConnection_BASE>; - protected: // Data attributes @@ -87,8 +83,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/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index e93f6c7ba5dd..29d4f51612ba 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -211,19 +211,14 @@ namespace connectivity using OPropertySetHelper::getFastPropertyValue; }; - class OOO_DLLPUBLIC_ODBCBASE OStatement_BASE2 : - public OStatement_Base - ,public ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE> - + class OOO_DLLPUBLIC_ODBCBASE OStatement_BASE2 : public OStatement_Base { - friend class OSubComponent<OStatement_BASE2, OStatement_BASE>; public: - OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ), - ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>(static_cast<cppu::OWeakObject*>(_pConnection), this){} + OStatement_BASE2(OConnection* _pConnection ) : + OStatement_Base(_pConnection ) + {} // OComponentHelper virtual void SAL_CALL disposing() override; - // XInterface - virtual void SAL_CALL release() throw() override; }; class OOO_DLLPUBLIC_ODBCBASE OStatement : |