mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#18683 NotifyFreeObj override is not helpful

Browse Source 
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2019-11-03 20:56:02 +00:00
parent 65aeaac24d
commit 6dd3c694e7
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
filter/source/msfilter/svdfppt.cxx
View File

@ -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.

2
include/filter/msfilter/msdffimp.hxx
View File

@ -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);

1
include/filter/msfilter/svdfppt.hxx
View File

@ -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 );
};