basegfx/source/polygon/b2dpolypolygoncutter.cxx | 17 ++++++++--------- editeng/source/editeng/impedit5.cxx | 6 ++++-- 2 files changed, 12 insertions(+), 11 deletions(-)
New commits: commit 14d846655766e4bf4498482b2c7710170b052f94 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Aug 29 20:56:41 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Aug 30 12:36:27 2024 +0200 cid#1607087 Overflowed constant Change-Id: I0d1e943d08cdcded264c44e0cf7a55385a0e2523 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172635 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index 38fd90778512..1cf414c1cc56 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -435,7 +435,6 @@ namespace basegfx // handle common nodes const sal_uInt32 nNodeCount(maSNV.size()); - sal_uInt32 a(0); // snap unsharp-equal points if(nNodeCount) @@ -465,16 +464,16 @@ namespace basegfx pLast = pCurrent; } - } - - for(a = 0; a < nNodeCount - 1; a++) - { - // test a before using it, not after. Also use nPointCount instead of aSortNodes.size() - PN& rPNb = *(maSNV[a].mpPN); - for(sal_uInt32 b(a + 1); b < nNodeCount && rPNb.maPoint.equal(maSNV[b].mpPN->maPoint); b++) + for (sal_uInt32 a = 0; a < nNodeCount - 1; a++) { - impHandleCommon(rPNb, *maSNV[b].mpPN); + // test a before using it, not after. Also use nPointCount instead of aSortNodes.size() + PN& rPNb = *(maSNV[a].mpPN); + + for(sal_uInt32 b(a + 1); b < nNodeCount && rPNb.maPoint.equal(maSNV[b].mpPN->maPoint); b++) + { + impHandleCommon(rPNb, *maSNV[b].mpPN); + } } } } commit afe3a9313fb35179231f14aa0ba5c9f357e09fa0 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Aug 29 20:58:34 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Aug 30 12:36:20 2024 +0200 cid#1607168 Overflowed constant Change-Id: I18856301045008938d5222ceb6774ff6fbb557fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172634 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index fff6d21d8373..11ed1ac8e77f 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -692,9 +692,11 @@ void ImpEditEngine::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich, bool ( !nWhich || ( pAttr->GetItem()->Which() == nWhich ) ) ) { pNode->GetCharAttribs().Remove(nAttr); - nAttr--; } - nAttr++; + else + { + nAttr++; + } pAttr = GetAttrib(rAttrs, nAttr); }
