From bdfc0056c12452bae2bfe7b05547cf3f13ca4241 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Mon, 13 May 2013 13:34:46 +0000 Subject: Resolves: #i122275# Don't show the layout panel for master pages (cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8) Conflicts: sd/source/ui/view/drviewsa.cxx Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5 --- sd/source/ui/view/drviews1.cxx | 5 +++++ sd/source/ui/view/drviewsa.cxx | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index faf114fc737a..552f61b16dc0 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -458,6 +458,11 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) Invalidate( SID_TITLE_MASTERPAGE ); Invalidate( SID_NOTES_MASTERPAGE ); Invalidate( SID_HANDOUT_MASTERPAGE ); + + if (meEditMode == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); + else + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage)); } } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index a74716543dd4..a580d607fbb4 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -137,7 +137,10 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas mpSelectionChangeHandler->Connect(); - SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); + if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE) + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage)); + else + SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage)); doShow(); } -- cgit