Kaydet (Commit) 8e4739b9 authored tarafından Caolán McNamara's avatar Caolán McNamara

afl-eventtesting + VclPtr: missing dispose on impress annotation window

regression from

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

    vclwidget: convert lots more sites to use VclPtr

Change-Id: Iac6a83003d9c395589acdc23fe511d2bb47e91ee
üst bcd5004c
...@@ -566,9 +566,9 @@ void AnnotationTag::OpenPopup( bool bEdit ) ...@@ -566,9 +566,9 @@ void AnnotationTag::OpenPopup( bool bEdit )
if( !mpAnnotationWindow.get() ) if( !mpAnnotationWindow.get() )
{ {
vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() ); vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() );
if( pWindow ) if( pWindow )
{ {
RealPoint2D aPosition( mxAnnotation->getPosition() ); 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) ) ) ) ); 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() ...@@ -604,7 +604,7 @@ void AnnotationTag::ClosePopup()
{ {
mpAnnotationWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); mpAnnotationWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler));
mpAnnotationWindow->Deactivate(); mpAnnotationWindow->Deactivate();
mpAnnotationWindow.reset(); mpAnnotationWindow.disposeAndClear();
} }
} }
......
...@@ -82,7 +82,7 @@ private: ...@@ -82,7 +82,7 @@ private:
VclPtr<AnnotationWindow> mpAnnotationWindow; VclPtr<AnnotationWindow> mpAnnotationWindow;
Color maColor; Color maColor;
int mnIndex; int mnIndex;
const vcl::Font& mrFont; const vcl::Font& mrFont;
Size maSize; Size maSize;
ImplSVEvent * mnClosePopupEvent; ImplSVEvent * mnClosePopupEvent;
VclPtr<vcl::Window> mpListenWindow; VclPtr<vcl::Window> mpListenWindow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment