summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2013-05-13 13:34:46 +0000
committerAndre Fischer <af@apache.org>2013-05-13 13:34:46 +0000
commit7fe1777ad29d92d16fbc11b7279375d37d11cef8 (patch)
tree1c3b2d459797217f5aaf56f2071086641675e41e /sd
parent0763a83fb20825c66d8a3ecc50327753f7508bf9 (diff)
122275: Don't show the layout panel for master pages.
Notes
Notes: merged as: 5f7fc90810a4bab148e0de745b980813cd4ad542
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drviews1.cxx5
-rw-r--r--sd/source/ui/view/drviewsa.cxx5
2 files changed, 9 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 8f87947731e2..615063f37cbb 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -516,6 +516,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 8420a23175af..211907c94b5d 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -156,7 +156,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));
}
/*************************************************************************