From f7c573ccf8878bcd12babfe64ceca60252c967e6 Mon Sep 17 00:00:00 2001
From: Mihai Varga <mihai.varga@collabora.com>
Date: Fri, 7 Aug 2015 09:03:26 +0300
Subject: [PATCH 167/398] Impress: set current page Id before showing the new
 page

For tiled rendering this has the effect of not invalidating the
previous slide when switching slides. After switching slides, an
invalidation occurs caused by showing the new slide, and calling
'GetPart' before 'SwitchPage' finishes returned the old part number.

Change-Id: I1cafd0e51cd39be3a80d0559ae3051238b8df744
Reviewed-on: https://gerrit.libreoffice.org/17562
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 45576ea3b3c19d8fe545e984bf23708df90b1990)
---
 sd/source/ui/view/drviews1.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index ec192473ec6e..3b749419e860 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -964,6 +964,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
             }
 
             mpDrawView->HideSdrPage();
+            maTabControl->SetCurPageId(nSelectedPage+1);
             mpDrawView->ShowSdrPage(mpActualPage);
             GetViewShellBase().GetDrawController().FireSwitchCurrentPage(mpActualPage);
 
@@ -989,7 +990,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
                 }
             }
 
-            maTabControl->SetCurPageId(nSelectedPage+1);
             OUString aPageName = mpActualPage->GetName();
 
             if (maTabControl->GetPageText(nSelectedPage+1) != aPageName)
@@ -1025,6 +1025,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
             }
 
             mpDrawView->HideSdrPage();
+            maTabControl->SetCurPageId(nSelectedPage+1);
 
             SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind);
 
@@ -1063,8 +1064,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
             if (nPos != -1)
                 aLayoutName = aLayoutName.copy(0, nPos);
 
-            maTabControl->SetCurPageId(nSelectedPage+1);
-
             if (maTabControl->GetPageText(nSelectedPage+1) != aLayoutName)
             {
                 maTabControl->SetPageText(nSelectedPage+1, aLayoutName);
-- 
2.12.0