[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source

[Michael Meeks]

 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6ce6b25ef4fbca3dae71b40e07176b0eeb8e1ca7
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sat Aug 3 13:35:19 2013 +0200

    fdo#67707 - avoid crash with sidebar when switching to writer from impress.
    
    Change-Id: I0010663951fe67bfb864ffdaecb251b3da5a3ac3
    (cherry picked from commit 457bc1ebdf327685fcf2ccac8d6c87c839c43200)
    Reviewed-on: https://gerrit.libreoffice.org/5516
    Tested-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index ca0ff0b..c1b1e1a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "controller/SlsSelectionFunction.hxx"
 
 #include "SlideSorter.hxx"
@@ -439,7 +438,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
                     mpModeHandler->SetCurrentPage(pDescriptor);
                     mpModeHandler->SwitchView(pDescriptor);
                 }
-                else
+                else if (pViewShell->GetDispatcher() != NULL)
                 {
                     pViewShell->GetDispatcher()->Execute(
                         SID_INSERTPAGE,