sd/source/ui/slidesorter/view/SlideSorterView.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
New commits: commit 577d0e71233eb00d459eb56163491bcb3a583bb4 Author: Tor Lillqvist <[email protected]> AuthorDate: Tue Jan 21 13:52:31 2020 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Wed Jan 22 14:51:24 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 <[email protected]> Tested-by: Tor Lillqvist <[email protected]> diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index ede6c7e5a702..f1fc5f602bb2 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -46,6 +46,7 @@ #include <sdpage.hxx> #include <Window.hxx> +#include <comphelper/lok.hxx> #include <sal/log.hxx> #include <svl/itempool.hxx> #include <svx/svdpagv.hxx> @@ -591,14 +592,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
