You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/05/21 11:22:28 UTC
svn commit: r1484711 - in /openoffice/trunk/main/sd/source/ui:
sidebar/LayoutMenu.cxx view/drviews1.cxx view/drviewsa.cxx
Author: af
Date: Tue May 21 09:22:27 2013
New Revision: 1484711
URL: http://svn.apache.org/r1484711
Log:
i122291: Showing the right set of layouts for handout mode. Fixed painting selection in layout panel.
Modified:
openoffice/trunk/main/sd/source/ui/sidebar/LayoutMenu.cxx
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/sidebar/LayoutMenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/sidebar/LayoutMenu.cxx?rev=1484711&r1=1484710&r2=1484711&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/sidebar/LayoutMenu.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/sidebar/LayoutMenu.cxx Tue May 21 09:22:27 2013
@@ -816,6 +816,7 @@ void LayoutMenu::UpdateSelection (void)
break;
// Find the entry of the menu for to the layout.
+ SetNoSelection();
sal_uInt16 nItemCount (GetItemCount());
for (sal_uInt16 nId=1; nId<=nItemCount; nId++)
{
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=1484711&r1=1484710&r2=1484711&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/drviews1.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviews1.cxx Tue May 21 09:22:27 2013
@@ -519,6 +519,9 @@ void DrawViewShell::ChangeEditMode(EditM
if (meEditMode == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+ else if (mePageKind == PK_HANDOUT)
+
+ SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
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=1484711&r1=1484710&r2=1484711&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx Tue May 21 09:22:27 2013
@@ -158,6 +158,8 @@ DrawViewShell::DrawViewShell( SfxViewFra
if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
+ else if (mePageKind == PK_HANDOUT)
+ SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_HandoutPage));
else
SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_MasterPage));
}