[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source svx/source

[Mark Hung]

 sd/source/ui/func/fuediglu.cxx |    2 +-
 svx/source/svdraw/svddrgv.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6442a8976b4accb53acb902834171ab5f1802d2a
Author: Mark Hung <marklh9 at gmail.com>
Date:   Fri Dec 15 00:13:49 2017 +0800

    tdf113594: marking gluepoints immediately.
    
    pPV was for the parameter of MarkGluePoint that was removed
    in ec38966951f2, and was kept somehow and is converted
    to bool here.  Just replace the default boolean value to false
    ( that means marking instead of unmarking. )
    
    Change-Id: I4c4b9dd368537b7b90cc4effae482a7b8a41eec9
    Reviewed-on: https://gerrit.libreoffice.org/46472
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit bf151f0716910b56e3538579f4af7ede8f51bbcf)
    Reviewed-on: https://gerrit.libreoffice.org/46497
    (cherry picked from commit 715d0f32eb36593a4c9e52763b2ceb17ec1283c5)
    Reviewed-on: https://gerrit.libreoffice.org/46913
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index bdb72cccccc6..daa4a6740ecc 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -141,7 +141,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
             if (!rMEvt.IsShift())
                 mpView->UnmarkAllGluePoints();
 
-            mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, aVEvt.pPV);
+            mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, false);
             SdrHdl* pHdl = mpView->GetGluePointHdl(aVEvt.pObj, aVEvt.nGlueId);
 
             if (pHdl)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 2c4d78762e03..6b7a224ae27f 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -752,7 +752,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
             rGP.SetAbsolutePos(rPnt,*pObj);
 
             SdrHdl* pHdl=nullptr;
-            if (MarkGluePoint(pObj,nGlueId,pPV))
+            if (MarkGluePoint(pObj,nGlueId,false))
             {
                 pHdl=GetGluePointHdl(pObj,nGlueId);
             }