[Libreoffice-commits] core.git: sd/source

[Andre Fischer]

 sd/source/ui/sidebar/LayoutMenu.cxx |    1 +
 sd/source/ui/view/drviews1.cxx      |    3 +++
 sd/source/ui/view/drviewsa.cxx      |    2 ++
 3 files changed, 6 insertions(+)

New commits:
commit b8520e02d2b1b18ece5dbc6dbac12b9481643fdd
Author: Andre Fischer <af at apache.org>
Date:   Tue May 21 09:22:27 2013 +0000

    Resolves: #i122291# Showing the right set of layouts for handout mode
    
    Fixed painting selection in layout panel
    
    (cherry picked from commit b89784c822670593cb253bcc0d260b93c9936e1c)
    
    Change-Id: I73d53bdcdec25753c8adb0f011f05868f82d35a5

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 9aa5955..ef6ae63 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -809,6 +809,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++)
         {
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 552f61b..876eab3 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -461,6 +461,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
 
         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));
     }
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 86c20dd..2287258 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -139,6 +139,8 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
 
     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));