From 120922361a5928ea4437ffe253ce209abd7060b0 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 12 Apr 2013 17:02:17 +0200 Subject: 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 --- sw/inc/anchoredobject.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/inc') 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 or method // . // The boolean is reset to , when the layout process for a - // page frame starts - see class . + // page frame starts. bool mbTmpConsiderWrapInfluence; mutable SwRect maObjRectWithSpaces; -- cgit