From 45576ea3b3c19d8fe545e984bf23708df90b1990 Mon Sep 17 00:00:00 2001 From: Mihai Varga Date: Fri, 7 Aug 2015 09:03:26 +0300 Subject: [PATCH] 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 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt --- 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 83e726fa7ab5..78a6bc0c86d3 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -967,6 +967,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) } mpDrawView->HideSdrPage(); + maTabControl->SetCurPageId(nSelectedPage+1); mpDrawView->ShowSdrPage(mpActualPage); GetViewShellBase().GetDrawController().FireSwitchCurrentPage(mpActualPage); @@ -992,7 +993,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) } } - maTabControl->SetCurPageId(nSelectedPage+1); OUString aPageName = mpActualPage->GetName(); if (maTabControl->GetPageText(nSelectedPage+1) != aPageName) @@ -1028,6 +1028,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) } mpDrawView->HideSdrPage(); + maTabControl->SetCurPageId(nSelectedPage+1); SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind); @@ -1066,8 +1067,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);