Kaydet (Commit) 847ac6ae authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) David Tardon

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
(cherry picked from commit 8e4739b9)
Reviewed-on: https://gerrit.libreoffice.org/19497Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 343595ff
......@@ -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();
}
}
......
......@@ -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;
......
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