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 06693f2c27a20ff52c14bcdbfe808aec543b0f70 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Nov 3 20:56:02 2019 +0000 Commit: Michael Stahl <[email protected]> CommitDate: Tue Nov 12 17:16:19 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/81970 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 71fbe72b2f52..7086026d9407 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -737,11 +737,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 84e66803b6dc..848b7fa0669a 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -516,7 +516,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 c378a10ebb6f..2da3dd166124 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -483,7 +483,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, SvxMSDffClientData& rData, DffObjData& rObj ) override; void ImportHeaderFooterContainer( DffRecordHeader const & rHeader, HeaderFooterEntry& rEntry ); }; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
