diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-13 15:49:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-13 18:51:45 +0200 |
| commit | faf3da0a9676a82fd5dcb9e931480935cb985bc0 (patch) | |
| tree | 789881934423a999e68501a0fddb451c65172002 /sw | |
| parent | eb3fb2ea717f591e75b04ff828415cb9ad452dcd (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 7 |
2 files changed, 3 insertions, 10 deletions
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(); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 890ccdd8fcc3..c8c11e93da39 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -341,11 +341,6 @@ void SAL_CALL SwXTextDocument::release()noexcept SfxBaseModel::release(); } -Reference< XAdapter > SwXTextDocument::queryAdapter( ) -{ - return SfxBaseModel::queryAdapter(); -} - Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() { Sequence< uno::Type > aNumTypes; @@ -370,7 +365,7 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() } SwXTextDocument::SwXTextDocument(SwDocShell* pShell) - : SfxBaseModel(pShell) + : SwXTextDocumentBaseClass(pShell) , m_pImpl(new Impl) , m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_DOCUMENT)), |