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

[Michael Stahl]

 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 53587dc7969b023416d865b516b7e800fc5de33a
Author: Michael Stahl <mst...@redhat.com>
Date:   Mon Aug 28 23:10:18 2017 +0200

    sd: AccessibleSlideSorterView: don't register twice at ViewShell
    
    Triggers assert in SfxListener::StartListening()
    
    Change-Id: I17f165d600fa789d7ce8d7b2296988064c5d5844

diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index b530e3ee8471..8268c5506643 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -796,8 +796,11 @@ void 
AccessibleSlideSorterView::Implementation::ReleaseListeners()
 
     if (mbListeningToDocument)
     {
-        if (mrSlideSorter.GetViewShell() != nullptr)
+        if (mrSlideSorter.GetViewShell() != nullptr && 
!IsListening(*mrSlideSorter.GetViewShell()))
+        {   // ??? is it even possible that ConnectListeners is called with no
+            // view shell and this one with a view shell?
             StartListening(*mrSlideSorter.GetViewShell());
+        }
         EndListening (*mrSlideSorter.GetModel().GetDocument());
         mbListeningToDocument = false;
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits