sw/source/core/layout/fly.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 536dba7c9258dc836ac85a4c927c367187a73806 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Apr 18 15:50:24 2023 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Apr 26 14:03:24 2023 +0200 sw: fix divide by 0 in SwFlyFrame::CalcRel https: //crashreport.libreoffice.org/stats/signature/SwFlyFrame::CalcRel(SwFormatFrameSize%20const%20&) Change-Id: If7a1919a2829bbec3292b3aa5f7f719c5ba0beef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150579 Tested-by: Jenkins Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 6f36e44f248c8e3705779d6692daaf79865a1378) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150566 Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 03300969235b9d7ffcc4d4b3168215ee927ddaf2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150572 Reviewed-by: Noel Grandin <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Christian Lohmaier <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 4cee6d9e712d..09834d7defd0 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2580,12 +2580,12 @@ Size SwFlyFrame::CalcRel( const SwFormatFrameSize &rSz ) const if ( rSz.GetHeightPercent() && rSz.GetHeightPercent() != SwFormatFrameSize::SYNCED ) aRet.setHeight( nRelHeight * rSz.GetHeightPercent() / 100 ); - if ( rSz.GetWidthPercent() == SwFormatFrameSize::SYNCED ) + if ( rSz.GetHeight() && rSz.GetWidthPercent() == SwFormatFrameSize::SYNCED ) { aRet.setWidth( aRet.Width() * ( aRet.Height()) ); aRet.setWidth( aRet.Width() / ( rSz.GetHeight()) ); } - else if ( rSz.GetHeightPercent() == SwFormatFrameSize::SYNCED ) + else if ( rSz.GetWidth() && rSz.GetHeightPercent() == SwFormatFrameSize::SYNCED ) { aRet.setHeight( aRet.Height() * ( aRet.Width()) ); aRet.setHeight( aRet.Height() / ( rSz.GetWidth()) );
