[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/source

[Caolán McNamara]

 filter/source/msfilter/svdfppt.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 14141f72d6019cad66796ab12aaec686ae4db439
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 21 09:16:33 2017 +0100

    ofz#2332 fix dangling pCObj
    
    Change-Id: Ifa62b1ce2aefa939cfceb2e110d126b785cb6e26
    Reviewed-on: https://gerrit.libreoffice.org/39034
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d51b2a811b78..43449eb59337 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2937,6 +2937,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
                                         pPtr->pAObj = nullptr;
                                     if (pPtr->pBObj == rSlidePersist.pBObj)
                                         pPtr->pBObj = nullptr;
+                                    if (pPtr->pCObj == rSlidePersist.pBObj)
+                                        pPtr->pCObj = nullptr;
                                 }
                             }
                             SdrObject::Free(rSlidePersist.pBObj);