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

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/svdfppt.cxx   |    5 -----
 include/filter/msfilter/msdffimp.hxx |    2 +-
 include/filter/msfilter/svdfppt.hxx  |    1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 6dd3c694e78deddcd84546f65e40a571b6e32b7d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 3 20:56:02 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 4 10:47:36 2019 +0100

    ofz#18683 NotifyFreeObj override is not helpful
    
    the base one works fine, the override on the SvxMSDffClientData is
    sufficient to do what we want here if the base method check of
    groupobj children was in use
    
    Change-Id: I8ee65532d95c167ee83d6c2918dd0b8508d98b48
    Reviewed-on: https://gerrit.libreoffice.org/81969
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index f9da59d7aca7..a122e6aac203 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -739,11 +739,6 @@ void ProcessData::NotifyFreeObj(SdrObject* pObj)
     }
 }
 
-void SdrEscherImport::NotifyFreeObj(SvxMSDffClientData& rData, SdrObject* pObj)
-{
-    rData.NotifyFreeObj(pObj);
-}
-
 /* ProcessObject is called from ImplSdPPTImport::ProcessObj to handle all application specific things,
    such as the import of text, animation effects, header footer and placeholder.
 
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 4defc7f0b8bb..341dc2b5329e 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -515,7 +515,7 @@ protected:
                                    SvxMSDffClientData& rClientData,
                                    tools::Rectangle& rTextRect,
                                    SdrObject* pObj);
-    virtual void NotifyFreeObj(SvxMSDffClientData& rData, SdrObject* pObj);
+    void NotifyFreeObj(SvxMSDffClientData& rData, SdrObject* pObj);
     void FreeObj(SvxMSDffClientData& rData, SdrObject* pObj);
 
 
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 574733030eed..efe56823e1c9 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -482,7 +482,6 @@ public:
     void                RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph );
     virtual SdrObject*  ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const;
     virtual SdrObject*  ProcessObj( SvStream& rSt, DffObjData& rData, SvxMSDffClientData& rClientData, tools::Rectangle& rTextRect, SdrObject* pObj ) override;
-    virtual void        NotifyFreeObj(SvxMSDffClientData& rData, SdrObject* pObj) override;
     virtual void        ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, DffObjData& rObj ) override;
     void                ImportHeaderFooterContainer( DffRecordHeader const & rHeader, HeaderFooterEntry& rEntry );
 };