[Libreoffice-commits] core.git: comphelper/source

[Noel Grandin (via logerrit)]

 comphelper/source/property/genericpropertyset.cxx |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 2b362ab651e197e4d96457503848504d9ed2a001
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Sep 10 16:54:35 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Sep 10 19:34:09 2023 +0200

    GenericPropertySet 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: I64f260f659f49f50f5bdaebaa9bc1cf9c67ffc21
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156796
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/comphelper/source/property/genericpropertyset.cxx 
b/comphelper/source/property/genericpropertyset.cxx
index 3d389172c496..65a3b9f476c1 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -44,7 +44,7 @@ namespace comphelper
 {
     namespace {
 
-    class GenericPropertySet :  public OWeakAggObject,
+    class GenericPropertySet :  public OWeakObject,
                                 public XServiceInfo,
                                 public XTypeProvider,
                                 public PropertySetHelper
@@ -62,7 +62,6 @@ namespace comphelper
         explicit GenericPropertySet( PropertySetInfo* pInfo ) noexcept;
 
         // 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;
@@ -175,11 +174,6 @@ void GenericPropertySet::_getPropertyValues( const 
comphelper::PropertyMapEntry*
 // XInterface
 
 Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType )
-{
-    return OWeakAggObject::queryInterface( rType );
-}
-
-Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType )
 {
     Any aAny;
 
@@ -192,19 +186,19 @@ Any SAL_CALL GenericPropertySet::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 GenericPropertySet::acquire() noexcept
 {
-    OWeakAggObject::acquire();
+    OWeakObject::acquire();
 }
 
 void SAL_CALL GenericPropertySet::release() noexcept
 {
-    OWeakAggObject::release();
+    OWeakObject::release();
 }
 
 uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes()