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

Michael Stahl mstahl at redhat.com
Wed Nov 5 12:48:13 PST 2014


 sd/source/ui/view/ViewShellManager.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9632045906baf165076d11a97f45b153d8e2acb7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 5 21:41:16 2014 +0100

    sd: fix STL assertion "dereference past-the-end iterator"
    
    (regression from 967a386bccb15b99915a1e878e42450fbe9a2d0e)
    
    Change-Id: I9408170eb155f433922e5b3887059078a141d78a

diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 91f82cd..65bdd9e 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -767,7 +767,8 @@ void ViewShellManager::Implementation::UpdateShellStack (void)
     CreateShells();
 
     // Update the pointer to the top-most active view shell.
-    mpTopViewShell = maActiveViewShells.begin()->mpShell;
+    mpTopViewShell = (maActiveViewShells.empty())
+        ? 0 : maActiveViewShells.begin()->mpShell;
 
 
     // 2. Create the internal target stack.


More information about the Libreoffice-commits mailing list