diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-06-03 11:30:58 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-03 11:32:43 +0100 |
commit | 91d0533451a99e3952531f7e62dc65b5ba9b43c1 (patch) | |
tree | 0f5ee695a8ef27724cc82bd727354db1d4183c6f /sd | |
parent | 905afcee78db68c21b24bddebb0ec082ca938c7d (diff) |
on switching to slide layouts panel move into slide layout context
i.e. exit current textbox edit and shape selection
Change-Id: I16a2fca158cb4caab7b6bd001742df698735dd2b
(cherry picked from commit 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798)
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 2 |
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", |