[Libreoffice-commits] core.git: sw/source

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Mon Nov 9 14:26:51 PST 2015


 sw/source/core/unocore/unoport.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 453cf8a4c44b7935c3029524bfd40fa9c1d87753
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Nov 9 23:13:00 2015 +0100

    yet another member of SwXTextPortion needs to be guarded in the dtor
    
    Change-Id: Ia1e3febd6a2f0c18c686a04ef5b98ee1ad2d8b88

diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index f3f8039..732dcc9 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -140,6 +140,11 @@ SwXTextPortion::~SwXTextPortion()
 {
     SolarMutexGuard aGuard;
     m_pUnoCursor.reset(nullptr);
+    if(m_FrameDepend.GetRegisteredIn())
+    {
+        auto pFrameDepend(const_cast<SwDepend*>(&m_FrameDepend));
+        pFrameDepend->GetRegisteredIn()->Remove(pFrameDepend);
+    }
 }
 
 uno::Reference< text::XText >  SwXTextPortion::getText()


More information about the Libreoffice-commits mailing list