summaryrefslogtreecommitdiff
path: root/sw/source/core/text/frmform.cxx
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-05-27 19:03:45 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2019-05-28 14:12:28 +0200
commita42291d0abd14c6c763962a5ae60b02a8552f641 (patch)
treefe986d68a323af9e41521cacd52ec3e9e51696e7 /sw/source/core/text/frmform.cxx
parent1424d51a44ed2fa8b37b2d132af8a608a170ec8e (diff)
Revert "crashtesting: frequent nulldef at end of SwTextFrame::ValidateFrame"
This reverts commit c5338e3ad116dbde0aed801f459173231716efa3. The actual problem was fixed in previous commit for tdf#125475. ValidateFrame() must only be called in text formatting with a SwTextLineAccess keeping the corresponding SwTextLine alive. Change-Id: I5b092b094f620f2dc2524aa5a83c673ec6b1fbbe Reviewed-on: https://gerrit.libreoffice.org/73048 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/source/core/text/frmform.cxx')
-rw-r--r--sw/source/core/text/frmform.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 3c018f0a702c..492a738941c3 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -107,13 +107,11 @@ void SwTextFrame::ValidateFrame()
ValidateText( this );
// We at least have to save the MustFit flag!
- OSL_ENSURE( HasPara(), "ResetPreps(), missing ParaPortion." );
- if (SwParaPortion *pPara = GetPara())
- {
- const bool bMustFit = pPara->IsPrepMustFit();
- ResetPreps();
- pPara->SetPrepMustFit( bMustFit );
- }
+ assert(HasPara() && "ResetPreps(), missing ParaPortion, SwCache bug?");
+ SwParaPortion *pPara = GetPara();
+ const bool bMustFit = pPara->IsPrepMustFit();
+ ResetPreps();
+ pPara->SetPrepMustFit( bMustFit );
}
// After a RemoveFootnote the BodyFrame and all Frames contained within it, need to be