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

Caolán McNamara caolanm at redhat.com
Sat Jan 9 09:12:04 PST 2016


 vcl/source/window/menu.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 5e217d65e072158e82dd7525c075bbccfdce5902
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 9 17:11:02 2016 +0000

    WaE: C4702: unreachable code
    
    regression from...
    
    commit 31bc9a228ed02dfa082e3a59c20b0ce106d5c75c
    Date:   Sat Jan 9 03:09:49 2016 +0530
    
        tdf#96888 Kill internal vcl dog-tags ...
    
    Change-Id: I3fb375701cd1f8d8d0ea7f8a22b727881eaf90eb

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 29fd6b9..c29ffda 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3138,9 +3138,7 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl
         if( ! pW->IsDisposed() )
             pW->ImplDecModalCount();
 
-        if ( !pWin->IsDisposed() )
-            return 0;
-        else
+        if ( pWin->IsDisposed() )
             return 0;
 
         // Restore focus (could already have been


More information about the Libreoffice-commits mailing list