sd/source/ui/slidesorter/view/SlideSorterView.cxx | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit ecfc94359d701d03b59812c30f5a77556891e0d4
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Jan 21 13:52:31 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 11 22:28:57 2020 +0100
tdf#129388: Avoid any actual painting of the slide sorter in the LOKit case
The JS code in Online creates its own slides sorter thing anyway, the
one is core is only needed as a data structure.
Change-Id: I0eeb79c523b72f7b616f11443198d5af82b70643
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87184
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88444
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 19750734056e..31df3f5ae004 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -41,6 +41,7 @@
#include <sdpage.hxx>
#include <Window.hxx>
+#include <comphelper/lok.hxx>
#include <vcl/svapp.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
@@ -570,14 +571,18 @@ void SlideSorterView::CompleteRedraw (
sdr::contact::ViewObjectContactRedirector* pRedirector)
{
(void)pRedirector;
+
+ if (comphelper::LibreOfficeKit::isActive())
+ return;
+
+ if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow())
+ return;
+
#ifdef DEBUG_TIMING
const double nStartTime (gaTimer.getElapsedTime());
SAL_INFO("sd.timing", "SlideSorterView::CompleteRedraw start" <<
(mnLockRedrawSmph ? " locked" : ""));
#endif
- if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow())
- return;
-
// The parent implementation of CompleteRedraw is called only when
// painting is locked. We do all the painting ourself. When painting
// is locked the parent implementation keeps track of the repaint
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
