summaryrefslogtreecommitdiff
path: root/sw/inc/anchoredobject.hxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-04-12 17:02:17 +0200
committerJan Holesovsky <kendy@suse.cz>2013-04-12 17:10:53 +0200
commit120922361a5928ea4437ffe253ce209abd7060b0 (patch)
treec3b4c4673ef8d121ea8f65cc960797a5791bbae4 /sw/inc/anchoredobject.hxx
parentd53dd70b15f0e3f7c8a05a93f8fcd70e1147c1f7 (diff)
i#23187: Fix crash of the document.
The mbLayoutInProgress bool was effectively unused - only set and reset, but the only place that was checking for that was in lcl_RecalcRow(), again, only to set and reset it. Worse - with the document from i#23187, the mbLayoutInProgress was set / reset on a page already disposed in SwFrm::InsertPage() which was causing the crash here. So let's get rid of all this mbLayoutInProgress, its getter and setter, and NotifyLayoutOfPageInProgress class. Valgrind, thank you that you exist, would have never found it without you! :-) Change-Id: I9a9b604f8a21bb50e21af1b20b8db76d2c0504bd
Diffstat (limited to 'sw/inc/anchoredobject.hxx')
-rw-r--r--sw/inc/anchoredobject.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 0611a23a0aa5..cc5edbfb17b0 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -107,7 +107,7 @@ class SW_DLLPUBLIC SwAnchoredObject
// detected in method <SwFlyAtCntFrm::MakeAll()> or method
// <SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()>.
// The boolean is reset to <false>, when the layout process for a
- // page frame starts - see class <NotifyLayoutOfPageInProgress>.
+ // page frame starts.
bool mbTmpConsiderWrapInfluence;
mutable SwRect maObjRectWithSpaces;