summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRas-al-Ghul <dipankar1995@gmail.com>2016-01-08 01:32:53 +0530
committerMichael Meeks <michael.meeks@collabora.com>2016-01-08 10:06:37 +0000
commit07ce6f1192ad65ec63bf174b35298fa040207646 (patch)
tree672dcd2695546ee5839221b418b3becf220f0611
parentf78ec21a800a5598a021ae76b5b5d72f03617a54 (diff)
tdf#96888 Kill internal vcl dog-tags ...
Did some changes to menufloatingwindow.cxx file. Patch No. 17 Change-Id: I3b7c9beb5f3e55930f66c463d4341b5a78d51bc1 Reviewed-on: https://gerrit.libreoffice.org/21234 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--vcl/source/window/menufloatingwindow.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 2128f08cce28..371aefe4d884 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -977,8 +977,7 @@ void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd )
void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
{
- ImplDelData aDelData;
- ImplAddDel( &aDelData );
+ VclPtr<vcl::Window> xWindow = this;
sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode();
bKeyInput = true;
@@ -1135,9 +1134,8 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
}
}
// #105474# check if menu window was not destroyed
- if ( !aDelData.IsDead() )
+ if ( !xWindow->IsDisposed() )
{
- ImplRemoveDel( &aDelData );
bKeyInput = false;
}
}