[Libreoffice-commits] core.git: svx/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Nov 10 11:59:03 UTC 2018


 svx/source/svdraw/svdocapt.cxx |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit a35e7f38942ca3cc3b277692fae86d0787db934a
Author:     Regina Henschel <rb.henschel at t-online.de>
AuthorDate: Thu Nov 8 18:35:48 2018 +0100
Commit:     Regina Henschel <rb.henschel at t-online.de>
CommitDate: Sat Nov 10 12:58:42 2018 +0100

    tdf#121287 Use correct markers on tail of legacy callout
    
    A legacy callout from toolbar 'Text', not a custom shape, is a
    rectangle with an additional tail. Currently only the end of
    the tail is dragable. The error was, that all points of the tail
    had got markers and that the markers had got a wrong point reference.
    
    Change-Id: I900b1294aaeefc0f46547c6db009a3c750955460
    Reviewed-on: https://gerrit.libreoffice.org/63120
    Tested-by: Jenkins
    Reviewed-by: Regina Henschel <rb.henschel at t-online.de>

diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 2fea3adbec97..ac2fde0070e3 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -297,16 +297,11 @@ sal_uInt32 SdrCaptionObj::GetHdlCount() const
 void SdrCaptionObj::AddToHdlList(SdrHdlList& rHdlList) const
 {
     SdrRectObj::AddToHdlList(rHdlList);
-    const sal_uInt32 nRectHdlCnt(rHdlList.GetHdlCount());
-
-    sal_uInt32 nCnt = aTailPoly.GetSize();
-    for(sal_uInt32 i = 0; i<nCnt; ++i)
-    {
-        std::unique_ptr<SdrHdl> pHdl(new SdrHdl(aTailPoly.GetPoint(i), SdrHdlKind::Poly));
-        pHdl->SetPolyNum(1);
-        pHdl->SetPointNum(nRectHdlCnt + i);
-        rHdlList.AddHdl(std::move(pHdl));
-    }
+    // Currently only dragging the tail's end is implemented.
+    std::unique_ptr<SdrHdl> pHdl(new SdrHdl(aTailPoly.GetPoint(0), SdrHdlKind::Poly));
+    pHdl->SetPolyNum(1);
+    pHdl->SetPointNum(0);
+    rHdlList.AddHdl(std::move(pHdl));
 }
 
 bool SdrCaptionObj::hasSpecialDrag() const


More information about the Libreoffice-commits mailing list