svx/source/unodraw/unoshtxt.cxx | 2 +- vcl/source/outdev/hatch.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit d90bf6f8c19d7c43ec83656a3a6f85a81aee573c Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 5 16:03:59 2022 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Nov 5 22:13:55 2022 +0100 ofz#53028 Integer-overflow Change-Id: I35c2731b8b6afe1d75f71e4c4b7bb12c07807faa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142340 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx index 10930bbcb424..3b92f6df5de9 100644 --- a/vcl/source/outdev/hatch.cxx +++ b/vcl/source/outdev/hatch.cxx @@ -327,14 +327,14 @@ void OutputDevice::CalcHatchValues( const tools::Rectangle& rRect, tools::Long n rPt1 = rRect.TopLeft(); rPt2 = Point( rRect.Left() - nXOff, rRect.Bottom() ); rEndPt1 = Point( rRect.Right() + nXOff, rRect.Top() ); - nPX = FRound( aRef.X() - ( ( rPt1.Y() - aRef.Y() ) / fTan ) ); + nPX = FRound( aRef.X() - ( (static_cast<double>(rPt1.Y()) - aRef.Y()) / fTan ) ); } else { rPt1 = rRect.BottomLeft(); rPt2 = Point( rRect.Left() - nXOff, rRect.Top() ); rEndPt1 = Point( rRect.Right() + nXOff, rRect.Bottom() ); - nPX = FRound( aRef.X() + ( ( rPt1.Y() - aRef.Y() ) / fTan ) ); + nPX = FRound( aRef.X() + ( (static_cast<double>(rPt1.Y()) - aRef.Y()) / fTan ) ); } if( nPX <= rPt1.X() ) commit 12e468a6066894e7ff01d622343d23fccbceeb09 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 5 15:09:07 2022 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Nov 5 22:13:43 2022 +0100 cid#1516651 Dereference after null check Change-Id: I0f4586538a672426cbfe60d1e589778741b08dbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142338 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index b1ca3ff0c65e..168212aaa159 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -551,7 +551,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() mpOutliner->SetText( *pOutlinerParaObject ); // put text to object and set EmptyPresObj to FALSE - if( mpText && bOwnParaObj && mpObject->IsEmptyPresObj() && pTextObj->IsReallyEdited() ) + if (mpText && bOwnParaObj && mpObject->IsEmptyPresObj() && pTextObj && pTextObj->IsReallyEdited()) { mpObject->SetEmptyPresObj( false ); static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText );
