[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source
Caolán McNamara
caolanm at redhat.com
Tue Oct 4 14:04:33 UTC 2016
sd/source/ui/annotations/annotationwindow.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 59a4486bb8519fbd54da0a924b7a5f9b712b3bf2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 1 21:09:48 2016 +0100
Engine() return mpOutliner, so can crash if Engine() used post delete
if Deactivate called during ::dispose
Change-Id: I066dcc52278f12442de0281c8d783353aed5a186
(cherry picked from commit 86617760eb8bc6c0b2713b9496ade9203d1077a5)
Reviewed-on: https://gerrit.libreoffice.org/29443
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 0e59a38..7cddb80 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -297,6 +297,7 @@ void AnnotationWindow::dispose()
mpMeta.disposeAndClear();
delete mpOutlinerView;
delete mpOutliner;
+ mpOutliner = nullptr;
mpVScrollbar.disposeAndClear();
mpTextWindow.disposeAndClear();
FloatingWindow::dispose();
@@ -614,6 +615,9 @@ void AnnotationWindow::Deactivate()
if (mrManager.getPopupMenuActive())
return;
+ if (!mpOutliner) //in dispose
+ return;
+
Reference< XAnnotation > xAnnotation( mxAnnotation );
// write changed text back to annotation
More information about the Libreoffice-commits
mailing list