diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-13 10:46:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-13 10:47:00 +0200 |
| commit | 1631fa9a722553da1ebe0650a65e859862c4405d (patch) | |
| tree | e1503c55b8f9822d7fe19ebdde83f495b23f7de9 /sd | |
| parent | 7000c07834af2231145519ae6fd81c6297bf9004 (diff) | |
tdf#95002 sd tiled rendering: fix handling of images on page switch
It turns out a full invalidation is still needed to trigger the loading
of graphics on the new page, so instead of not invalidating just don't
emit the notification about it during page switch.
Change-Id: Ic99a3d4e268b3db61cf09c78ed0f310c9d365867
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/sdwindow.cxx | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1854d6519239..971c5dcd2274 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -387,6 +387,7 @@ public: const Color& GetAppBackgroundColor() const { return mnAppBackgroundColor; } void SetAppBackgroundColor( Color nNewColor ) { mnAppBackgroundColor = nNewColor; } + bool IsInSwitchPage() { return mbIsInSwitchPage; } //move this method to ViewShell. //void NotifyAccUpdate(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 0ff2d8bcad28..cf146aef2fd8 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -992,8 +992,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) } else { - bool bInvalidate = !comphelper::LibreOfficeKit::isActive(); - pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines(), bInvalidate ); + pNewPageView->SetHelpLines( mpFrameView->GetStandardHelpLines() ); } } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 83b65bd0ca48..2f5330726a4d 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -1006,6 +1006,10 @@ Selection Window::GetSurroundingTextSelection() const void Window::LogicInvalidate(const Rectangle* pRectangle) { + DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mpViewShell); + if (pDrawViewShell && pDrawViewShell->IsInSwitchPage()) + return; + OString sRectangle; if (!pRectangle) sRectangle = "EMPTY"; |