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);