sw/source/uibase/utlui/content.cxx | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 7ddd6c008142a6b88878ffc96f5e339a0fddd7d9
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 1 15:45:39 2015 +0200
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
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 7e82523..b2a8e34 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2220,15 +2220,12 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
}
else if(bIsConstant)
{
- if(!lcl_FindShell(pActiveShell))
- {
- if (pActiveShell)
- EndListening(*pActiveShell->GetView().GetDocShell());
- pActiveShell = pSh;
- bIsActive = true;
- bIsConstant = false;
- bClear = true;
- }
+ if (pActiveShell)
+ EndListening(*pActiveShell->GetView().GetDocShell());
+ pActiveShell = pSh;
+ bIsActive = true;
+ bIsConstant = false;
+ bClear = true;
}
// Only if it is the active view, the array will be deleted and
// the screen filled new.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
