vcl/source/window/floatwin.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 2e2a13e7160f258982b09125f5e32acd267b3f3a Author: Caolán McNamara <[email protected]> Date: Tue May 24 10:42:04 2016 +0100 fix crash on pressing esc on Insert->Table floating window Change-Id: Icc06626608228a1fb4e043ccc73b6a6fb438401a diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 82283c9..d130466 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; }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
