summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/porrst.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 09611e728441..3ec7042502a4 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -210,7 +210,8 @@ SwTwips SwTextFrame::EmptyHeight() const
SwViewShell *pSh = getRootFrame()->GetCurrShell();
if ( dynamic_cast<const SwCursorShell*>( pSh ) != nullptr ) {
SwCursorShell *pCrSh = static_cast<SwCursorShell*>(pSh);
- SwContentFrame *pCurrFrame=pCrSh->GetCurrFrame();
+ // this is called during formatting so avoid recursive layout
+ SwContentFrame const*const pCurrFrame = pCrSh->GetCurrFrame(false);
if (pCurrFrame==static_cast<SwContentFrame const *>(this)) {
// do nothing
} else {