Resolves: #i122275# Don't show the layout panel for master pages

(cherry picked from commit 7fe1777a)

Conflicts:
	sd/source/ui/view/drviewsa.cxx

Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5

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

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