forcepoint#38 notify that obj in group was deleted

Change-Id: I4599a8e93eccb28c8a406418fd5c7c670b59c871
Reviewed-on: https://gerrit.libreoffice.org/53162
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 36 insertions, 1 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 4eaf3205e437..6e1726c9785c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5028,8 +5028,34 @@ void SvxMSDffManager::GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt
     }
 }
 
-void SvxMSDffManager::FreeObj(void* /*pData*/, SdrObject* pObj)
+SvxMSDffImportRec* SvxMSDffImportData::find(const SdrObject* pObj)
 {
+    for (const auto& it : *this)
+    {
+        if (it->pObj == pObj)
+            return it.get();
+    }
+    return nullptr;
+}
+
+void SvxMSDffManager::NotifyFreeObj(void* pData, SdrObject* pObj)
+{
+    if (SdrObjGroup* pGroup = dynamic_cast<SdrObjGroup*>(pObj))
+    {
+        SdrObjList* pSubList = pGroup->GetSubList();
+        size_t nObjCount = pSubList->GetObjCount();
+        for (size_t i = 0; i < nObjCount; ++i)
+            NotifyFreeObj(pData, pSubList->GetObj(i));
+    }
+
+    SvxMSDffImportData& rImportData = *static_cast<SvxMSDffImportData*>(pData);
+    if (SvxMSDffImportRec* pRecord = rImportData.find(pObj))
+        pRecord->pObj = nullptr;
+}
+
+void SvxMSDffManager::FreeObj(void* pData, SdrObject* pObj)
+{
+    NotifyFreeObj(pData, pObj);
     SdrObject::Free(pObj);
 }
 
@@ -7471,4 +7497,13 @@ SdrObject* SvxMSDffManager::getShapeForId( sal_Int32 nShapeId )
     return aIter != maShapeIdContainer.end() ? (*aIter).second : nullptr;
 }
 
+SvxMSDffImportData::SvxMSDffImportData(const tools::Rectangle& rParentRect)
+    : aParentRect(rParentRect)
+{
+}
+
+SvxMSDffImportData::~SvxMSDffImportData()
+{
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */