diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-13 11:03:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-13 15:58:28 +0000 |
| commit | 4aa8f40f666b87038c6399c8cd2782e7d8e9c527 (patch) | |
| tree | ed7fe7008d09bf0d6a5acb2e3293a0cf14381180 /dbaccess/source/inc | |
| parent | 1fd4e669a99225459fc3b5bf082487c2644ce691 (diff) | |
Base OSubComponent on cppu::WeakComponentImplHelper
...rather than on cppu::OComponentHelper (which derives from XAggregation) and
then manually suppressing support for XAggregation in
OSubComponent::queryInterface
Change-Id: I6718d36f20579806b508c4bf5048b734643ad716
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145476
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess/source/inc')
| -rw-r--r-- | dbaccess/source/inc/apitools.hxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 7438c08725dc..0f4f2c9bec1c 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -21,12 +21,12 @@ #include <sal/config.h> -#include <cppuhelper/component.hxx> +#include <cppuhelper/compbase.hxx> #include <osl/mutex.hxx> // OSubComponent - a component which holds a hard ref to its parent // and is been hold itself (by the parent) with a weak ref -class OSubComponent : public ::cppu::OComponentHelper +class OSubComponent : public ::cppu::WeakComponentImplHelper<> { protected: // the parent must support the tunnel implementation @@ -37,11 +37,7 @@ public: OSubComponent(::osl::Mutex& _rMutex, const css::uno::Reference< css::uno::XInterface >& _xParent); -// css::lang::XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - // css::uno::XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL release() noexcept override; operator css::uno::Reference< css::uno::XInterface > () const |