From 8e4739b94de0bbc7ceb91705a7ba7946b8b70b94 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 20 Oct 2015 21:04:48 +0100
Subject: afl-eventtesting + VclPtr: missing dispose on impress annotation
 window

regression from

commit c72fac269626cd4c2c3f62a6eed69e47b59256a4
Date:   Mon Mar 16 12:17:44 2015 +0200

    vclwidget: convert lots more sites to use VclPtr

Change-Id: Iac6a83003d9c395589acdc23fe511d2bb47e91ee
---
 sd/source/ui/annotations/annotationtag.cxx | 8 ++++----
 sd/source/ui/annotations/annotationtag.hxx | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sd/source/ui/annotations')

diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index bcd3ad88b457..7fdfec5dd74c 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -566,9 +566,9 @@ void AnnotationTag::OpenPopup( bool bEdit )
 
     if( !mpAnnotationWindow.get() )
     {
-           vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() );
-           if( pWindow )
-           {
+        vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() );
+        if( pWindow )
+        {
             RealPoint2D aPosition( mxAnnotation->getPosition() );
             Point aPos( pWindow->OutputToScreenPixel( pWindow->LogicToPixel( Point( static_cast<long>(aPosition.X * 100.0), static_cast<long>(aPosition.Y * 100.0) ) ) ) );
 
@@ -604,7 +604,7 @@ void AnnotationTag::ClosePopup()
     {
         mpAnnotationWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler));
         mpAnnotationWindow->Deactivate();
-        mpAnnotationWindow.reset();
+        mpAnnotationWindow.disposeAndClear();
     }
 }
 
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index f627c1f5bdeb..4a7e0da6c0cb 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -82,7 +82,7 @@ private:
     VclPtr<AnnotationWindow>                        mpAnnotationWindow;
     Color                                           maColor;
     int                                             mnIndex;
-    const vcl::Font&                              mrFont;
+    const vcl::Font&                                mrFont;
     Size                                            maSize;
     ImplSVEvent *                                   mnClosePopupEvent;
     VclPtr<vcl::Window>                             mpListenWindow;
-- 
cgit