[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source

[Michael Meeks (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 109df7755b505ffe9b089fc5943e56c716368297
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Jan 24 16:42:48 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Jan 25 14:51:10 2020 +0100

    lok: create marking overlay object, but add no objects to it
    
    null mpMarkObjOverlay was used for a number of other reasons.
    
    Change-Id: I0681d9c544f0cd3f93e991eb048b97bd58f94787
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87349
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 90dc167c64f9..bd19e90cfc5c 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -96,6 +96,9 @@ ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx:
 :   maSecondPosition(rStartPos),
     mbUnmarking(bUnmarking)
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return; // We do client-side object manipulation with the Kit API
+
     for(sal_uInt32 a(0); a < rView.PaintWindowCount(); a++)
     {
         SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
@@ -359,12 +362,8 @@ void SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark)
 
     DBG_ASSERT(nullptr == mpMarkObjOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkObjOverlay (!)");
 
-    // We do client-side object manipulation with the Kit API
-    if (!comphelper::LibreOfficeKit::isActive())
-    {
-        basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
-        mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
-    }
+    basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
+    mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
 
     maDragStat.Reset(rPnt);
     maDragStat.NextPoint();