ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Impress: set current page Id before showing the new page

Browse Source 
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>
This commit is contained in:
Mihai Varga
2015-10-01 14:40:40 +00:00
committed by Samuel Mehrbrodt
parent 5e985c2f34
commit 45576ea3b3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sd/source/ui/view/drviews1.cxx
+2 -3
View File
@@ -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);