diff options
Diffstat (limited to 'sd/source/ui/annotations/annotationwindow.cxx')
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index dcbeb2262a75..1b2fd3808872 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -298,6 +298,7 @@ void AnnotationWindow::dispose() mpMeta.disposeAndClear(); delete mpOutlinerView; delete mpOutliner; + mpOutliner = nullptr; mpVScrollbar.disposeAndClear(); mpTextWindow.disposeAndClear(); FloatingWindow::dispose(); @@ -613,6 +614,9 @@ void AnnotationWindow::SetColor() void AnnotationWindow::Deactivate() { + if (!mpOutliner) //in dispose + return; + Reference< XAnnotation > xAnnotation( mxAnnotation ); // write changed text back to annotation |