From faf3da0a9676a82fd5dcb9e931480935cb985bc0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 13 Jul 2021 15:49:20 +0200 Subject: use ImplInheritanceHelper in SwXTextDocument so we avoid having two copies of OWeakObject in it Change-Id: Ia592f1d67a730da35c5d73c81c689d9da02fce1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118853 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sw/inc/unotxdoc.hxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sw/inc/unotxdoc.hxx') diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 5e2619819095..79044005530a 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -90,8 +90,9 @@ namespace com::sun::star::uno { class XAggregation; } namespace com::sun::star::util { class XReplaceDescriptor; } -typedef cppu::WeakImplHelper +typedef cppu::ImplInheritanceHelper < + SfxBaseModel, css::text::XTextDocument, css::text::XLineNumberingProperties, css::text::XChapterNumberingSupplier, @@ -131,7 +132,6 @@ SwXTextDocumentBaseClass; class SW_DLLPUBLIC SwXTextDocument final : public SwXTextDocumentBaseClass, public SvxFmMSFactory, - public SfxBaseModel, public vcl::ITiledRenderable, public css::tiledrendering::XTiledRenderable { @@ -216,8 +216,6 @@ public: virtual void SAL_CALL release( ) noexcept override; //XWeak - virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter( ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); -- cgit