summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/ssfrm.cxx
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-10-15 15:24:08 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-11-15 15:09:59 +0100
commit3576d5b7a429052fabd71842a30f0bdc32c4103e (patch)
tree61a8138658dda33d7dc786456a6c6374e341a3ec /sw/source/core/layout/ssfrm.cxx
parent57aa6493b36a0f7c153e64fecca623f6136a160b (diff)
sw_redlinehide_3: fix SwAccessibleParagraph not being disposed
If it is merged, it doesn't have GetDep(). Change-Id: I5a362c03fe7fcb0a6246aef0a0ac2824c48ede36
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
-rw-r--r--sw/source/core/layout/ssfrm.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 47e5b598b99b..f309693befc2 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -325,8 +325,10 @@ void SwFrame::DestroyImpl()
// accessible objects for fly and cell frames have been already disposed
// by the destructors of the derived classes.
- if( IsAccessibleFrame() && !(IsFlyFrame() || IsCellFrame()) && GetDep() )
+ if (IsAccessibleFrame() && !(IsFlyFrame() || IsCellFrame())
+ && (GetDep() || IsTextFrame())) // sw_redlinehide: text frame may not have Dep!
{
+ assert(!IsTextFrame() || GetDep() || static_cast<SwTextFrame*>(this)->GetMergedPara());
SwRootFrame *pRootFrame = getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() )
{