summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-03 11:30:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-03 11:31:00 +0100
commit05aaef55252bc9f90cbbcc1967c38ab9a5a6c798 (patch)
tree1b0a9f2f8381ca05ab83860f13bf0ff8becb307d /sd
parentb81daea4a78083def286fa2d5360b152b7a703fd (diff)
on switching to slide layouts panel move into slide layout context
i.e. exit current textbox edit and shape selection Change-Id: I16a2fca158cb4caab7b6bd001742df698735dd2b
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index ac06fa27ad20..f50e3b002ca3 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -116,6 +116,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 )
{
// First make sure that the sidebar is visible
+ mrViewShell.GetDrawView()->SdrEndTextEdit();
+ mrViewShell.GetDrawView()->UnmarkAll();
mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
sfx2::sidebar::Sidebar::ShowPanel(
"SdLayoutsPanel",