diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-10-20 21:04:48 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-26 16:04:06 +0100 |
| commit | 4edfa23c46a63d49b8c2e00eec54c6d043b2139b (patch) | |
| tree | 5f3bd875ad20564614f1999ecf46f9c940d9fcce | |
| parent | 3de20b55cc891abd5b83a0b9a3d077cc83c82e12 (diff) | |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 847ac6ae8372aafc28e06f24009ac77572334486)
| -rw-r--r-- | sd/source/ui/annotations/annotationtag.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotationtag.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 530102903100..4faec9617f24 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 036e682ff118..1158417c5e30 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; |