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

[Caolán McNamara]

 sd/source/ui/view/ViewShellImplementation.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 3 11:30:58 2016 +0100

    on switching to slide layouts panel move into slide layout context
    
    i.e. exit current textbox edit and shape selection
    
    Change-Id: I16a2fca158cb4caab7b6bd001742df698735dd2b

diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index ac06fa2..f50e3b0 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",