Author: af
Date: Mon May 13 13:34:46 2013
New Revision: 1481844
URL: http://svn.apache.org/r1481844
Log:
122275: Don't show the layout panel for master pages.
Modified:
openoffice/trunk/main/sd/source/ui/view/drviews1.cxx
openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
Modified: openoffice/trunk/main/sd/source/ui/view/drviews1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviews1.cxx?rev=1481844&r1=1481843&r2=1481844&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/drviews1.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviews1.cxx Mon May 13 13:34:46
2013
@@ -516,6 +516,11 @@ void DrawViewShell::ChangeEditMode(EditM
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));
}
}
Modified: openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx?rev=1481844&r1=1481843&r2=1481844&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx Mon May 13 13:34:46
2013
@@ -156,7 +156,10 @@ DrawViewShell::DrawViewShell( SfxViewFra
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));
}
/*************************************************************************
