diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-09-09 13:57:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-09-10 13:44:15 +0200 |
| commit | d6d0bd11ec38978156b9dbbda50bdddc9159e064 (patch) | |
| tree | cd76fd8943adb69fbea1298a58cd6836ed0033b6 /xmloff/source/core | |
| parent | 67e0e7f57c37162ce5a8f888094c46a8267c1cc3 (diff) | |
PropertySetMergerImpl 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: I40f4906723ab040b95a8db5c34e81b09a5ede38c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156772
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/core')
| -rw-r--r-- | xmloff/source/core/PropertySetMerger.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index 7663aef638d3..65a936bb3d80 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.cxx @@ -19,18 +19,17 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <PropertySetMerger.hxx> +#include <comphelper/sequence.hxx> +#include <cppuhelper/implbase.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#include <comphelper/sequence.hxx> -#include <cppuhelper/implbase3.hxx> - namespace { -class PropertySetMergerImpl : public ::cppu::WeakAggImplHelper3< XPropertySet, XPropertyState, XPropertySetInfo > +class PropertySetMergerImpl : public ::cppu::WeakImplHelper< XPropertySet, XPropertyState, XPropertySetInfo > { private: Reference< XPropertySet > mxPropSet1; |