diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-09-10 12:13:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-09-10 19:04:08 +0200 |
| commit | 8d8afabeab1e93c42d13496a855f0ad4efd2e9cd (patch) | |
| tree | 85e63bf8b3474b6d81a3ee73504d1bb3ef7649a9 /svtools | |
| parent | 83dea83cc5079c615923910727b95ef89a1936cc (diff) | |
SvUnoImageMapObject does not need to implement XAggreggation
Checked on jenkins using 'make check' and
+void SAL_CALL setDelegator(css::uno::Reference<css::uno::XInterface> const &) final { assert(false); }
Change-Id: I79cf929cc64ea7af7351674e02fb0bc83538c869
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156792
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/unoimap.cxx | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 210e580818c0..1776f2ce7305 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -28,7 +28,6 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> -#include <cppuhelper/weakagg.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <algorithm> @@ -64,7 +63,7 @@ const sal_Int32 HANDLE_TITLE = 10; namespace { -class SvUnoImageMapObject : public OWeakAggObject, +class SvUnoImageMapObject : public OWeakObject, public XEventsSupplier, public XServiceInfo, public PropertySetHelper, @@ -83,7 +82,6 @@ public: virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) override; // XInterface - virtual Any SAL_CALL queryAggregation( const Type & rType ) override; virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() noexcept override; virtual void SAL_CALL release() noexcept override; @@ -294,11 +292,6 @@ std::unique_ptr<IMapObject> SvUnoImageMapObject::createIMapObject() const Any SAL_CALL SvUnoImageMapObject::queryInterface( const Type & rType ) { - return OWeakAggObject::queryInterface( rType ); -} - -Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType ) -{ Any aAny; if( rType == cppu::UnoType<XServiceInfo>::get()) @@ -312,25 +305,24 @@ Any SAL_CALL SvUnoImageMapObject::queryAggregation( const Type & rType ) else if( rType == cppu::UnoType<XMultiPropertySet>::get()) aAny <<= Reference< XMultiPropertySet >(this); else - aAny = OWeakAggObject::queryAggregation( rType ); + aAny = OWeakObject::queryInterface( rType ); return aAny; } void SAL_CALL SvUnoImageMapObject::acquire() noexcept { - OWeakAggObject::acquire(); + OWeakObject::acquire(); } void SAL_CALL SvUnoImageMapObject::release() noexcept { - OWeakAggObject::release(); + OWeakObject::release(); } uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes() { static const uno::Sequence< uno::Type > aTypes { - cppu::UnoType<XAggregation>::get(), cppu::UnoType<XEventsSupplier>::get(), cppu::UnoType<XServiceInfo>::get(), cppu::UnoType<XPropertySet>::get(), |