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