[Libreoffice-commits] core.git: vcl/source

[Ras-al-Ghul]

 vcl/source/window/menufloatingwindow.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 07ce6f1192ad65ec63bf174b35298fa040207646
Author: Ras-al-Ghul <dipankar1995 at gmail.com>
Date:   Fri Jan 8 01:32:53 2016 +0530

    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 at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 2128f08..371aefe 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;
     }
 }