svx/source/svdraw/svdglue.cxx | 5 +++++
svx/source/svdraw/svdpntv.cxx | 5 +++++
2 files changed, 10 insertions(+)
New commits:
commit 611130065625650adad4e2e2204ca5b42b9f65c0
Author: merttumer <mert.tu...@collabora.com>
AuthorDate: Thu Mar 11 10:33:04 2021 +0300
Commit: Mert Tumer <mert.tu...@collabora.com>
CommitDate: Tue Apr 20 04:33:16 2021 +0200
lok: Don't invalidate GluePoints
Change-Id: Ie579b31e6ee2067f5b88464c62c0870b68a461a2
Signed-off-by: merttumer <mert.tu...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112315
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114029
Tested-by: Jenkins
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 4cce1a58ad26..05a89173e5df 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>
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);
@@ -324,6 +327,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 59d1a55a8888..9074036a3edc 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -780,6 +780,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++)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
