Kaydet (Commit) 7ddd6c00 authored tarafından Michael Stahl's avatar Michael Stahl

tdf#88360: sw: fix crash on closing help in Navigator window

SwContentTree::pActiveShell is not cleared because of a check that the
shell exists, which is only done in the special case bIsConstant.

* at most one of bIsActive or bIsConstant is true
* the only place that calls SetActiveShell() if bIsConstant is true
  already checks this condition

So remove the unnecessary check from SetActiveShell()

Change-Id: Id3b3b98bd38303b5afc529cc8be669872bd354b7
üst 15d00363
...@@ -2220,15 +2220,12 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh) ...@@ -2220,15 +2220,12 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
} }
else if(bIsConstant) else if(bIsConstant)
{ {
if(!lcl_FindShell(pActiveShell)) if (pActiveShell)
{ EndListening(*pActiveShell->GetView().GetDocShell());
if (pActiveShell) pActiveShell = pSh;
EndListening(*pActiveShell->GetView().GetDocShell()); bIsActive = true;
pActiveShell = pSh; bIsConstant = false;
bIsActive = true; bClear = true;
bIsConstant = false;
bClear = true;
}
} }
// Only if it is the active view, the array will be deleted and // Only if it is the active view, the array will be deleted and
// the screen filled new. // the screen filled new.
......
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