editeng/source/items/frmitems.cxx | 2 +- sc/source/filter/html/htmlpars.cxx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit d86360c7d0ed6cfd35f9d64503d019922b3333ee Author: Caolán McNamara <[email protected]> AuthorDate: Thu Nov 7 09:01:15 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 8 12:33:15 2024 +0100 cid#1608267 silence Overflowed constant Change-Id: I10dfd5953e8f481c12111e2b541fece6aa2897e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176260 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 924346c7de8e..9b825df20f7d 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -717,8 +717,10 @@ void ScHTMLLayoutParser::Adjust() pE->nColOverlap = 1; } SCCOL nColTmp = o3tl::saturating_add(pE->nCol, pE->nColOverlap); - SCROW nRowTmp = o3tl::saturating_add(pE->nRow ,pE->nRowOverlap); - xLockedList->Join( ScRange( pE->nCol, pE->nRow, 0, nColTmp - 1, nRowTmp - 1, 0 ) ); + SCROW nRowTmp = o3tl::saturating_add(pE->nRow, pE->nRowOverlap); + xLockedList->Join(ScRange(pE->nCol, pE->nRow, 0, + o3tl::saturating_sub<SCCOL>(nColTmp, 1), + o3tl::saturating_sub<SCROW>(nRowTmp, 1), 0)); // Take over MaxDimensions if ( nColMax < nColTmp ) nColMax = nColTmp; commit 06221a8c08e8898491a73ac8c6cbb42410f768a8 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Nov 8 10:00:27 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 8 12:33:08 2024 +0100 cid#1634530 COPY_INSTEAD_OF_MOVE Change-Id: Iae03c8a982659503d7f73dbabbcece7bdb9c8e55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176259 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 96db6916d454..073ad972e9ac 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -4392,7 +4392,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) ASSERT_CHANGE_REFCOUNTED_ITEM; std::unique_ptr<GraphicObject> xOldGrfObj(std::move(xGraphicObject)); - xGraphicObject.reset(new GraphicObject(aGraphic)); + xGraphicObject.reset(new GraphicObject(std::move(aGraphic))); ApplyGraphicTransparency_Impl(); xOldGrfObj.reset();
