[Libreoffice-commits] core.git: filter/source

[Noel Grandin (via logerrit)]

 filter/source/pdf/pdfdecomposer.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 2d4f840a950ba64be5ba81ff72b2cb4bdc0f97de
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Sep 9 13:48:10 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Sep 9 15:41:41 2023 +0200

    fix XPdfDecomposer
    
    accidentally pushed the test commit:
        commit d3e0130b1e5a0beb7995565b6e365aec248eece0
        Author: Noel Grandin <noel.gran...@collabora.co.uk>
        Date:   Fri Sep 8 14:02:13 2023 +0200
        XPdfDecomposer does not need to implement XAggreggation
    
    Change-Id: I8d65d69723120648020654ded658d0fa7c62d906
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156769
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/filter/source/pdf/pdfdecomposer.cxx 
b/filter/source/pdf/pdfdecomposer.cxx
index e13ffbb8e162..998f73dc1160 100644
--- a/filter/source/pdf/pdfdecomposer.cxx
+++ b/filter/source/pdf/pdfdecomposer.cxx
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
@@ -32,19 +32,13 @@ using namespace css;
 namespace
 {
 /// Class to convert the PDF data into a XPrimitive2D (containing only a 
bitmap).
-class XPdfDecomposer
-    : public ::cppu::WeakAggImplHelper2<graphic::XPdfDecomposer, 
lang::XServiceInfo>
+class XPdfDecomposer : public ::cppu::WeakImplHelper<graphic::XPdfDecomposer, 
lang::XServiceInfo>
 {
 public:
     explicit XPdfDecomposer(uno::Reference<uno::XComponentContext> const& 
context);
     XPdfDecomposer(const XPdfDecomposer&) = delete;
     XPdfDecomposer& operator=(const XPdfDecomposer&) = delete;
 
-    void SAL_CALL setDelegator(css::uno::Reference<css::uno::XInterface> 
const&) final
-    {
-        assert(false);
-    }
-
     // XPdfDecomposer
     uno::Sequence<uno::Reference<graphic::XPrimitive2D>> SAL_CALL
     getDecomposition(const uno::Reference<util::XBinaryDataContainer>& 
xDataContainer,