Kaydet (Commit) 4fc4b336 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#113336 avoid crash during teardown

Change-Id: Icdebd5aca1a2bdaefb904d153ca97a6cc56ac7ff
Reviewed-on: https://gerrit.libreoffice.org/43712Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ec451bcb
...@@ -1742,9 +1742,13 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst ) ...@@ -1742,9 +1742,13 @@ SwTwips SwFlyFrame::Grow_( SwTwips nDist, bool bTst )
{ {
m_bFormatHeightOnly = true; m_bFormatHeightOnly = true;
} }
static_cast<SwFlyFreeFrame*>(this)->SetNoMoveOnCheckClip( true ); SwViewShell* pSh = getRootFrame()->GetCurrShell();
static_cast<SwFlyFreeFrame*>(this)->SwFlyFreeFrame::MakeAll(getRootFrame()->GetCurrShell()->GetOut()); if (pSh)
static_cast<SwFlyFreeFrame*>(this)->SetNoMoveOnCheckClip( false ); {
static_cast<SwFlyFreeFrame*>(this)->SetNoMoveOnCheckClip( true );
static_cast<SwFlyFreeFrame*>(this)->SwFlyFreeFrame::MakeAll(pSh->GetOut());
static_cast<SwFlyFreeFrame*>(this)->SetNoMoveOnCheckClip( false );
}
// #i55416# // #i55416#
if ( rFrameSz.GetWidthSizeType() != ATT_FIX_SIZE ) if ( rFrameSz.GetWidthSizeType() != ATT_FIX_SIZE )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment