diff options
| author | Andre Fischer <af@apache.org> | 2013-05-13 13:34:46 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:33 +0100 |
| commit | bdfc0056c12452bae2bfe7b05547cf3f13ca4241 (patch) | |
| tree | 6f7560f1a0522d2d576a4aa7c70ce1f6d56a534b /sd/source/ui | |
| parent | 4e023d28bd914ef6ed32c7daa08b098618157089 (diff) | |
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
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 5 |
2 files changed, 9 insertions, 1 deletions
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(); } |