|
 |
f325b2 |
From f7c573ccf8878bcd12babfe64ceca60252c967e6 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Mihai Varga <mihai.varga@collabora.com>
|
|
|
f325b2 |
Date: Fri, 7 Aug 2015 09:03:26 +0300
|
|
|
f325b2 |
Subject: [PATCH 167/398] Impress: set current page Id before showing the new
|
|
|
f325b2 |
page
|
|
|
f325b2 |
|
|
|
f325b2 |
For tiled rendering this has the effect of not invalidating the
|
|
|
f325b2 |
previous slide when switching slides. After switching slides, an
|
|
|
f325b2 |
invalidation occurs caused by showing the new slide, and calling
|
|
|
f325b2 |
'GetPart' before 'SwitchPage' finishes returned the old part number.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I1cafd0e51cd39be3a80d0559ae3051238b8df744
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/17562
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
|
|
|
f325b2 |
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
|
|
|
f325b2 |
(cherry picked from commit 45576ea3b3c19d8fe545e984bf23708df90b1990)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
sd/source/ui/view/drviews1.cxx | 5 ++---
|
|
|
f325b2 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
|
|
|
f325b2 |
index ec192473ec6e..3b749419e860 100644
|
|
|
f325b2 |
--- a/sd/source/ui/view/drviews1.cxx
|
|
|
f325b2 |
+++ b/sd/source/ui/view/drviews1.cxx
|
|
|
f325b2 |
@@ -964,6 +964,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
mpDrawView->HideSdrPage();
|
|
|
f325b2 |
+ maTabControl->SetCurPageId(nSelectedPage+1);
|
|
|
f325b2 |
mpDrawView->ShowSdrPage(mpActualPage);
|
|
|
f325b2 |
GetViewShellBase().GetDrawController().FireSwitchCurrentPage(mpActualPage);
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -989,7 +990,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
- maTabControl->SetCurPageId(nSelectedPage+1);
|
|
|
f325b2 |
OUString aPageName = mpActualPage->GetName();
|
|
|
f325b2 |
|
|
|
f325b2 |
if (maTabControl->GetPageText(nSelectedPage+1) != aPageName)
|
|
|
f325b2 |
@@ -1025,6 +1025,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
mpDrawView->HideSdrPage();
|
|
|
f325b2 |
+ maTabControl->SetCurPageId(nSelectedPage+1);
|
|
|
f325b2 |
|
|
|
f325b2 |
SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind);
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -1063,8 +1064,6 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
|
|
|
f325b2 |
if (nPos != -1)
|
|
|
f325b2 |
aLayoutName = aLayoutName.copy(0, nPos);
|
|
|
f325b2 |
|
|
|
f325b2 |
- maTabControl->SetCurPageId(nSelectedPage+1);
|
|
|
f325b2 |
-
|
|
|
f325b2 |
if (maTabControl->GetPageText(nSelectedPage+1) != aLayoutName)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
maTabControl->SetPageText(nSelectedPage+1, aLayoutName);
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|