Kaydet (Commit) 45576ea3 authored tarafından Mihai Varga's avatar Mihai Varga Kaydeden (comit) Samuel Mehrbrodt

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/17562Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 5e985c2f
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment