[Libreoffice-commits] core.git: 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 91fb918a713597349c24812a742732b54e3734ef
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: Fri Jan 17 09:46:06 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/+/86934
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 68881166e651..231305eeae37 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -34,6 +34,7 @@
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <comphelper/lok.hxx>
 
 
 E3dDragMethod::E3dDragMethod (
@@ -214,6 +215,10 @@ void E3dDragMethod::CreateOverlayGeometry(
     sdr::overlay::OverlayManager& rOverlayManager,
     const sdr::contact::ObjectContact& rObjectContact)
 {
+    // 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 8bc1ef3689ce..80c421e40149 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -72,6 +72,7 @@
 #include <drawinglayer/attribute/sdrlineattribute.hxx>
 #include <drawinglayer/attribute/sdrlinestartendattribute.hxx>
 #include <svl/itempool.hxx>
+#include <comphelper/lok.hxx>
 #include <map>
 #include <vector>
 
@@ -680,6 +681,10 @@ void SdrDragMethod::CreateOverlayGeometry(
     sdr::overlay::OverlayManager& rOverlayManager,
     const sdr::contact::ObjectContact& rObjectContact)
 {
+    // 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 4f9e748dd922..56cc4db99e0f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -357,8 +357,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();