From 3579df2e34825da4939c5b10d17c79872badc549 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 12 Oct 2015 14:25:18 +0200 Subject: [PATCH 200/398] sd tiled rendering: make invalidation in DrawViewShell::SwitchPage() optional In case of tiled rendering clients already get LOK_CALLBACK_SET_PART when switching slides, so it's pointless to additionally invalidate windows for help lines. Change-Id: Ibc15c9862ae85bd72328161fa5f7e72d82fd2a97 (cherry picked from commit ca3436723455a0d0f3ced6f33b646b7c79ab05a1) --- include/svx/svdpagv.hxx | 2 +- sd/source/ui/view/drviews1.cxx | 3 ++- svx/source/svdraw/svdpagv.cxx | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index f28e3e7cb79d..3b890c13cd70 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -224,7 +224,7 @@ public: const SetOfByte& GetLockedLayers() const { return aLayerLock; } const SdrHelpLineList& GetHelpLines() const { return aHelpLines; } - void SetHelpLines(const SdrHelpLineList& rHLL); + void SetHelpLines(const SdrHelpLineList& rHLL, bool bInvalidate = true); //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos); void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine); void DeleteHelpLine(sal_uInt16 nNum); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 3b749419e860..c92cfde79262 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -986,7 +986,8 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) } else { - pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines() ); + bool bInvalidate = !comphelper::LibreOfficeKit::isActive(); + pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines(), bInvalidate ); } } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 9c74d433e1c9..47fa8f52b471 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -741,10 +741,11 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const } } -void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL) +void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL, bool bInvalidate) { aHelpLines=rHLL; - InvalidateAllWin(); + if (bInvalidate) + InvalidateAllWin(); } void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine) -- 2.12.0