summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-11-09 23:13:00 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-11-09 23:13:46 +0100
commit453cf8a4c44b7935c3029524bfd40fa9c1d87753 (patch)
tree3c2984750ef6aaf265c3d7d5046e4a8fba207735 /sw
parent003ba90531b6ee5c3b3225298a1490ed9a7048a4 (diff)
yet another member of SwXTextPortion needs to be guarded in the dtor
Change-Id: Ia1e3febd6a2f0c18c686a04ef5b98ee1ad2d8b88
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unoport.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index f3f803977274..732dcc9a651c 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()