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

[merttumer (via logerrit)]

 svx/source/svdraw/svdglue.cxx |    5 +++++
 svx/source/svdraw/svdpntv.cxx |    5 +++++
 2 files changed, 10 insertions(+)

New commits:
commit dedd720cf7188bb1e70f977099c5cee76e83541d
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Thu Mar 11 10:33:04 2021 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Fri Apr 9 07:09:50 2021 +0200

    lok: Don't invalidate GluePoints
    
    Change-Id: Ie579b31e6ee2067f5b88464c62c0870b68a461a2
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112315
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 2f9d53028988..f9a6992a0ec7 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -23,6 +23,7 @@
 #include <svx/svdglue.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
+#include <comphelper/lok.hxx>
 
 static const Size aGlueHalfSize(4,4);
 
@@ -253,6 +254,8 @@ void SdrGluePoint::Shear(const Point& rRef, double tn, bool bVShear, const SdrOb
 
 void SdrGluePoint::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
     bool bMapMode=rWin.IsMapModeEnabled();
     Point aPt(pObj!=nullptr ? GetAbsolutePos(*pObj) : GetPos());
     aPt=rWin.LogicToPixel(aPt);
@@ -329,6 +332,8 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
 
 void SdrGluePointList::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
     for (auto& xGP : aList)
         xGP->Invalidate(rWin,pObj);
 }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index ec2a3b1917c5..f4fa2e4783bc 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -823,6 +823,11 @@ bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/)
 
 void SdrPaintView::GlueInvalidate() const
 {
+    // Do not invalidate GluePoints in Online
+    // They are handled on front-end
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     const sal_uInt32 nWindowCount(PaintWindowCount());
 
     for(sal_uInt32 nWinNum(0); nWinNum < nWindowCount; nWinNum++)