commit 26001f4f84b0d921c8612d888856613735ba5314
author Regina Henschel <rb.henschel@t-online.de> Wed Nov 07 17:25:32 2018 +0100
committer Regina Henschel <rb.henschel@t-online.de> Sat Nov 10 12:53:23 2018 +0100
tree 82998d77fb4caacfca3d61341bb83a65d26c6583
parent 065edb4c8e91170017df482843d0c3eb8d4db114

tdf120965 Simplify SdrPathObj::AddToHdlList()

A polygon consists of line segments without controls and curve
segments with two controls. Where two segments meet, can only be
'line to line', 'line to curve' or 'curve to curve'. So for a
handle which marks a meeting point of two segments, there are 0
or 1 control before and 0 or 1 control after. Thus a loop is not
needed and makes the code harder to read. Therefore I have
removed the loop.

Change-Id: I48bcdbdf028542e08b3f5ed3f66907f2993e26bd
Reviewed-on: https://gerrit.libreoffice.org/63036
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>

svx/source/svdraw/svdopath.cxx

diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index eda7c34..63481a1 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2008,62 +2008,45 @@

void SdrPathObj::AddToPlusHdlList(SdrHdlList& rHdlList, SdrHdl& rHdl) const
{
    // keep old stuff to be able to keep old SdrHdl stuff, too
    const XPolyPolygon aOldPathPolygon(GetPathPoly());
    sal_uInt16 nPnt = static_cast<sal_uInt16>(rHdl.GetPointNum());
    // exclude some error situations
    const XPolyPolygon aPathPolyPolygon(GetPathPoly());
    sal_uInt16 nPolyNum = static_cast<sal_uInt16>(rHdl.GetPolyNum());

    if (nPolyNum>=aOldPathPolygon.Count())
    if (nPolyNum>=aPathPolyPolygon.Count())
        return;

    const XPolygon& rXPoly = aOldPathPolygon[nPolyNum];
    sal_uInt16 nPntMax = rXPoly.GetPointCount();

    if (nPntMax<=0)
        return;
    nPntMax--;
    if (nPnt>nPntMax)
    const XPolygon& rXPoly = aPathPolyPolygon[nPolyNum];
    sal_uInt16 nPntCount = rXPoly.GetPointCount();
    if (nPntCount<=0)
        return;

    // calculate the number of plus points
    sal_uInt16 nCnt = 0;
    if (rXPoly.GetFlags(nPnt)!=PolyFlags::Control)
    sal_uInt16 nPnt = static_cast<sal_uInt16>(rHdl.GetPointNum());
    if (nPnt>=nPntCount)
        return;

    if (rXPoly.IsControl(nPnt))
        return;

    // segment before
    if (nPnt==0 && IsClosed())
        nPnt=nPntCount-1;
    if (nPnt>0 && rXPoly.IsControl(nPnt-1))
    {
        if (nPnt==0 && IsClosed())
            nPnt=nPntMax;
        if (nPnt>0 && rXPoly.GetFlags(nPnt-1)==PolyFlags::Control)
            nCnt++;
        if (nPnt==nPntMax && IsClosed())
            nPnt=0;
        if (nPnt<nPntMax && rXPoly.GetFlags(nPnt+1)==PolyFlags::Control)
            nCnt++;
        std::unique_ptr<SdrHdl> pHdl(new SdrHdlBezWgt(&rHdl));
        pHdl->SetPos(rXPoly[nPnt-1]);
        pHdl->SetPointNum(nPnt-1);
        pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
        pHdl->SetPlusHdl(true);
        rHdlList.AddHdl(std::move(pHdl));
    }

    // construct the plus points
    for (sal_uInt32 nPlusNum = 0; nPlusNum < nCnt; ++nPlusNum)
    // segment after
    if (nPnt==nPntCount-1 && IsClosed())
        nPnt=0;
    if (nPnt<nPntCount-1 && rXPoly.IsControl(nPnt+1))
    {
        nPnt = static_cast<sal_uInt16>(rHdl.GetPointNum());
        std::unique_ptr<SdrHdl> pHdl(new SdrHdlBezWgt(&rHdl));
        pHdl->SetPolyNum(rHdl.GetPolyNum());

        if (nPnt==0 && IsClosed())
            nPnt=nPntMax;
        if (nPnt>0 && rXPoly.GetFlags(nPnt-1)==PolyFlags::Control && nPlusNum==0)
        {
            pHdl->SetPos(rXPoly[nPnt-1]);
            pHdl->SetPointNum(nPnt-1);
        }
        else
        {
            if (nPnt==nPntMax && IsClosed())
                nPnt=0;
            if (nPnt<rXPoly.GetPointCount()-1 && rXPoly.GetFlags(nPnt+1)==PolyFlags::Control)
            {
                pHdl->SetPos(rXPoly[nPnt+1]);
                pHdl->SetPointNum(nPnt+1);
            }
        }

        pHdl->SetPos(rXPoly[nPnt+1]);
        pHdl->SetPointNum(nPnt+1);
        pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
        pHdl->SetPlusHdl(true);
        rHdlList.AddHdl(std::move(pHdl));