diff options
| author | Andre Fischer <af@apache.org> | 2013-05-21 09:22:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-22 11:34:41 +0100 |
| commit | 9277f40f231b6d14a181be5c61a02c9053f136fa (patch) | |
| tree | 4cd2f125912dde3964c16e26b1bb58bfc73f5135 /sd/source | |
| parent | a75ce7e18b4d6d2098b213d14dd7687a554d728d (diff) | |
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
(cherry picked from commit b8520e02d2b1b18ece5dbc6dbac12b9481643fdd)
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 9aa5955b0d11..ef6ae63b2a7c 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 552f61b16dc0..876eab309070 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 86c20ddbef78..22872581c7f3 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)); |