diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-12 14:25:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-12 14:25:18 +0200 |
| commit | ca3436723455a0d0f3ced6f33b646b7c79ab05a1 (patch) | |
| tree | 9be701fed0ed28914a4c98fc425a9336432f4474 | |
| parent | 27fa10fa53c7ff28c2636b6b49118c87c822f2fd (diff) | |
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
| -rw-r--r-- | include/svx/svdpagv.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 3 | ||||
| -rw-r--r-- | 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 48c5b5bae554..04b18f97b690 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -221,7 +221,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 cf146aef2fd8..0ff2d8bcad28 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -992,7 +992,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 003777192ade..bb7c9212c21b 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) |