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

[Michael Meeks (via logerrit)]

 svx/source/engine3d/dragmt3d.cxx |    5 +++++
 svx/source/svdraw/svddrgmt.cxx   |    5 +++++
 svx/source/svdraw/svdmrkv.cxx    |    9 +++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 2a380ac6c8e30d7e96a84482ce5935ddf7014dfc
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Jan 15 14:21:13 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jan 16 17:21:07 2020 +0100

    lok: don't render shape selection overlays in lok mode.
    
    These are rendered client-side, doing it twice is a bug;
    also rendering of dashed-lines via drawinglayer decomposition
    is extraordinarily slow, so avoid it.
    
    Change-Id: I821f14699abd6bc9e7a6759c81edded2f792677d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86855
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 94d2bd213fbd..0e683cd073d0 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -33,6 +33,7 @@
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
+#include <comphelper/lok.hxx>
 #include <o3tl/make_unique.hxx>
 
 
@@ -211,6 +212,10 @@ void E3dDragMethod::MoveSdrDrag(const Point& /*rPnt*/)
 // for migration from XOR to overlay
 void E3dDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager)
 {
+    // We do client-side object manipulation with the Kit API
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     const sal_uInt32 nCnt(maGrp.size());
     basegfx::B2DPolyPolygon aResult;
 
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d6d9a8db0668..e353c41038d1 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -69,6 +69,7 @@
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
 #include <drawinglayer/attribute/sdrlinestartendattribute.hxx>
 #include <svl/itempool.hxx>
+#include <comphelper/lok.hxx>
 #include <map>
 #include <vector>
 
@@ -658,6 +659,10 @@ typedef std::map< const SdrObject*, SdrObject* > SdrObjectAndCloneMap;
 
 void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager)
 {
+    // We do client-side object manipulation with the Kit API
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     // create SdrDragEntries on demand
     if(maSdrDragEntries.empty())
     {
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index aa10261baff2..a48642e40013 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -358,8 +358,13 @@ void SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark)
     BrkAction();
 
     DBG_ASSERT(nullptr == mpMarkObjOverlay, "SdrMarkView::BegMarkObj: There exists a mpMarkObjOverlay (!)");
-    basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
-    mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
+
+    // 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);
+    }
 
     maDragStat.Reset(rPnt);
     maDragStat.NextPoint();