[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Caolán McNamara]

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

New commits:
commit 847ac6ae8372aafc28e06f24009ac77572334486
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 20 21:04:48 2015 +0100

    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
    (cherry picked from commit 8e4739b94de0bbc7ceb91705a7ba7946b8b70b94)
    Reviewed-on: https://gerrit.libreoffice.org/19497
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 5301029..4faec96 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 036e682..1158417 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;