sd/source/ui/inc/DocumentRenderer.hxx | 10 ++++------ sd/source/ui/view/DocumentRenderer.cxx | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-)
New commits: commit 9530816af8b178f3179deab441ea99db96e423bd Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Tue Dec 28 19:57:52 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Dec 29 08:09:42 2021 +0100 use comphelper::WeakComponentImplHelper in sd::DocumentRenderer Change-Id: I0eea3b1cd1e4b9a83d2227c48c687827adbb0218 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127652 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index cb87b03bd22f..7cbeefc799b8 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -20,21 +20,19 @@ #pragma once #include <com/sun/star/view/XRenderable.hpp> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> #include <memory> namespace sd { class ViewShellBase; } namespace sd { -typedef ::cppu::WeakComponentImplHelper < +typedef comphelper::WeakComponentImplHelper < css::view::XRenderable > DocumentRendererInterfaceBase; -class DocumentRenderer - : protected ::cppu::BaseMutex, - public DocumentRendererInterfaceBase +class DocumentRenderer final + : public DocumentRendererInterfaceBase { public: DocumentRenderer (ViewShellBase& rBase); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index c61eccb3419a..09f8d390368d 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -2215,8 +2215,7 @@ bool CheckForFrontBackPages( sal_Int32 nPage ) //===== DocumentRenderer ====================================================== DocumentRenderer::DocumentRenderer (ViewShellBase& rBase) - : DocumentRendererInterfaceBase(m_aMutex), - mpImpl(new Implementation(rBase)) + : mpImpl(new Implementation(rBase)) { }