summaryrefslogtreecommitdiff
path: root/include/connectivity/sdbcx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-01 13:54:31 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-02 11:21:36 +0100
commit1b67ad6ff8979d8851db1223886bb03745845755 (patch)
treef68fd6e34fcb3f1bb2b55b61e44cf0690a9f5f0a /include/connectivity/sdbcx
parente91aa231ee934b2f18b387f37a6e9017b05f2256 (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 'include/connectivity/sdbcx')
-rw-r--r--include/connectivity/sdbcx/VCatalog.hxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index a5e1dfbb2b1b..e39cd11abb22 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -30,7 +30,6 @@
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <connectivity/CommonTools.hxx>
-#include <connectivity/OSubComponent.hxx>
#include <connectivity/sdbcx/IRefreshable.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
#include <memory>
@@ -55,10 +54,8 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog :
public OCatalog_BASE,
public IRefreshableGroups,
- public IRefreshableUsers,
- public connectivity::OSubComponent<OCatalog, OCatalog_BASE>
+ public IRefreshableUsers
{
- friend class connectivity::OSubComponent<OCatalog, OCatalog_BASE>;
protected:
::osl::Mutex m_aMutex;
@@ -104,8 +101,6 @@ namespace connectivity
// ::cppu::OComponentHelper
virtual void SAL_CALL disposing() override;
- // XInterface
- void SAL_CALL release() throw() override;
// XTablesSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override;
// XViewsSupplier