Kaydet (Commit) 4357300a authored tarafından Miklos Vajna's avatar Miklos Vajna

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 ca343672)
üst 3839eba1
...@@ -224,7 +224,7 @@ public: ...@@ -224,7 +224,7 @@ public:
const SetOfByte& GetLockedLayers() const { return aLayerLock; } const SetOfByte& GetLockedLayers() const { return aLayerLock; }
const SdrHelpLineList& GetHelpLines() const { return aHelpLines; } 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 SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos);
void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine); void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine);
void DeleteHelpLine(sal_uInt16 nNum); void DeleteHelpLine(sal_uInt16 nNum);
......
...@@ -999,7 +999,8 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) ...@@ -999,7 +999,8 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
} }
else else
{ {
pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines() ); bool bInvalidate = !comphelper::LibreOfficeKit::isActive();
pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines(), bInvalidate );
} }
} }
......
...@@ -741,10 +741,11 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const ...@@ -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; aHelpLines=rHLL;
InvalidateAllWin(); if (bInvalidate)
InvalidateAllWin();
} }
void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine) void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment