summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-24 10:42:04 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-24 10:44:37 +0100
commit2e2a13e7160f258982b09125f5e32acd267b3f3a (patch)
tree9804344a600ec1ff8f3884c2d5977b7e5adf04e4 /vcl
parent95d20a3799998b9816bd2e8aebdbc96c61cead3e (diff)
fix crash on pressing esc on Insert->Table floating window
Change-Id: Icc06626608228a1fb4e043ccc73b6a6fb438401a
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/floatwin.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 82283c94337e..d130466d1603 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -569,7 +569,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const vcl::Window* pWindow )
IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void)
{
- VclPtr<FloatingWindow> pThis(this);
+ VclPtr<FloatingWindow> xThis(this);
mnPostId = nullptr;
mnPopupModeFlags = FloatWinPopupFlags::NONE;
mbPopupMode = false;
@@ -590,6 +590,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) )
{
+ VclPtr<FloatingWindow> xThis(this);
Close();
return true;
}