Kaydet (Commit) 3576d5b7 authored tarafından Michael Stahl's avatar Michael Stahl

sw_redlinehide_3: fix SwAccessibleParagraph not being disposed

If it is merged, it doesn't have GetDep().

Change-Id: I5a362c03fe7fcb0a6246aef0a0ac2824c48ede36
üst 57aa6493
...@@ -325,8 +325,10 @@ void SwFrame::DestroyImpl() ...@@ -325,8 +325,10 @@ void SwFrame::DestroyImpl()
// accessible objects for fly and cell frames have been already disposed // accessible objects for fly and cell frames have been already disposed
// by the destructors of the derived classes. // 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(); SwRootFrame *pRootFrame = getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() ) if( pRootFrame && pRootFrame->IsAnyShellAccessible() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment