ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

GalleryItem does not need to implement XAggreggation

Browse Source 
Checked on jenkins using 'make check' and

+    void SAL_CALL setDelegator(css::uno::Reference<css::uno::XInterface> const &) final { assert(false); }
+

Change-Id: I136a7b51ba7d5500876dcd8892f1165334daa15f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156643
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-09-07 18:41:46 +02:00
parent 46b8c7a83f
commit 4b814e8db4
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svx/source/unogallery/unogalitem.cxx
+4 -10
View File
@@ -70,7 +70,7 @@ bool GalleryItem::isValid() const
}
uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType )
uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType )
{
uno::Any aAny;
@@ -87,29 +87,23 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType )
else if( rType == cppu::UnoType<beans::XMultiPropertySet>::get())
aAny <<= uno::Reference< beans::XMultiPropertySet >(this);
else
aAny = OWeakAggObject::queryAggregation( rType );
aAny = OWeakObject::queryInterface( rType );
return aAny;
}
uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType )
{
return OWeakAggObject::queryInterface( rType );
}
void SAL_CALL GalleryItem::acquire()
noexcept
{
OWeakAggObject::acquire();
OWeakObject::acquire();
}
void SAL_CALL GalleryItem::release()
noexcept
{
OWeakAggObject::release();
OWeakObject::release();
}
svx/source/unogallery/unogalitem.hxx
+4 -7
View File
@@ -26,7 +26,7 @@
#include <com/sun/star/gallery/XGalleryItem.hpp>
#include <comphelper/propertysethelper.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <cppuhelper/weakagg.hxx>
#include <comphelper/compbase.hxx>
class GalleryTheme;
struct GalleryObject;
@@ -34,12 +34,10 @@ namespace unogallery { class GalleryTheme; }
namespace unogallery {
typedef ::comphelper::WeakComponentImplHelper<css::lang::XServiceInfo, css::gallery::XGalleryItem> GalleryItem_Base;
class GalleryItem final : public ::cppu::OWeakAggObject,
public css::lang::XServiceInfo,
public css::lang::XTypeProvider,
public css::gallery::XGalleryItem,
public ::comphelper::PropertySetHelper
class GalleryItem final : public GalleryItem_Base,
public ::comphelper::PropertySetHelper
{
friend class ::unogallery::GalleryTheme;
@@ -53,7 +51,6 @@ public:
private:
// XInterface
virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire() noexcept override;
virtual void SAL_CALL release() noexcept override;