loplugin:flatten in toolkit

Change-Id: I8f4b29620134566f256f05bbab677e83baf20ec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100031
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 63 insertions, 63 deletions

diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 0ba38df421c2..93d154a92ed2 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -88,79 +88,79 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void )
 {
     DBG_ASSERT( rMenuEvent.GetMenu() && mpMenu, "Menu???" );
 
-    if ( rMenuEvent.GetMenu() == mpMenu )  // Also called for the root menu
+    if ( rMenuEvent.GetMenu() != mpMenu )  // Also called for the root menu
+        return;
+
+    switch ( rMenuEvent.GetId() )
     {
-        switch ( rMenuEvent.GetId() )
+        case VclEventId::MenuSelect:
         {
-            case VclEventId::MenuSelect:
-            {
-                if ( maMenuListeners.getLength() )
-                {
-                    css::awt::MenuEvent aEvent;
-                    aEvent.Source = static_cast<cppu::OWeakObject*>(this);
-                    aEvent.MenuId = mpMenu->GetCurItemId();
-                    maMenuListeners.itemSelected( aEvent );
-                }
-            }
-            break;
-            case VclEventId::ObjectDying:
+            if ( maMenuListeners.getLength() )
             {
-                mpMenu = nullptr;
+                css::awt::MenuEvent aEvent;
+                aEvent.Source = static_cast<cppu::OWeakObject*>(this);
+                aEvent.MenuId = mpMenu->GetCurItemId();
+                maMenuListeners.itemSelected( aEvent );
             }
-            break;
-            case VclEventId::MenuHighlight:
+        }
+        break;
+        case VclEventId::ObjectDying:
+        {
+            mpMenu = nullptr;
+        }
+        break;
+        case VclEventId::MenuHighlight:
+        {
+            if ( maMenuListeners.getLength() )
             {
-                if ( maMenuListeners.getLength() )
-                {
-                    css::awt::MenuEvent aEvent;
-                    aEvent.Source = static_cast<cppu::OWeakObject*>(this);
-                    aEvent.MenuId = mpMenu->GetCurItemId();
-                    maMenuListeners.itemHighlighted( aEvent );
-                }
+                css::awt::MenuEvent aEvent;
+                aEvent.Source = static_cast<cppu::OWeakObject*>(this);
+                aEvent.MenuId = mpMenu->GetCurItemId();
+                maMenuListeners.itemHighlighted( aEvent );
             }
-            break;
-            case VclEventId::MenuActivate:
+        }
+        break;
+        case VclEventId::MenuActivate:
+        {
+            if ( maMenuListeners.getLength() )
             {
-                if ( maMenuListeners.getLength() )
-                {
-                    css::awt::MenuEvent aEvent;
-                    aEvent.Source = static_cast<cppu::OWeakObject*>(this);
-                    aEvent.MenuId = mpMenu->GetCurItemId();
-                    maMenuListeners.itemActivated( aEvent );
-                }
+                css::awt::MenuEvent aEvent;
+                aEvent.Source = static_cast<cppu::OWeakObject*>(this);
+                aEvent.MenuId = mpMenu->GetCurItemId();
+                maMenuListeners.itemActivated( aEvent );
             }
-            break;
-            case VclEventId::MenuDeactivate:
+        }
+        break;
+        case VclEventId::MenuDeactivate:
+        {
+            if ( maMenuListeners.getLength() )
             {
-                if ( maMenuListeners.getLength() )
-                {
-                    css::awt::MenuEvent aEvent;
-                    aEvent.Source = static_cast<cppu::OWeakObject*>(this);
-                    aEvent.MenuId = mpMenu->GetCurItemId();
-                    maMenuListeners.itemDeactivated( aEvent );
-                }
+                css::awt::MenuEvent aEvent;
+                aEvent.Source = static_cast<cppu::OWeakObject*>(this);
+                aEvent.MenuId = mpMenu->GetCurItemId();
+                maMenuListeners.itemDeactivated( aEvent );
             }
-            break;
-
-            // ignore accessibility events
-            case VclEventId::MenuEnable:
-            case VclEventId::MenuInsertItem:
-            case VclEventId::MenuRemoveItem:
-            case VclEventId::MenuSubmenuActivate:
-            case VclEventId::MenuSubmenuDeactivate:
-            case VclEventId::MenuSubmenuChanged:
-            case VclEventId::MenuDehighlight:
-            case VclEventId::MenuDisable:
-            case VclEventId::MenuItemTextChanged:
-            case VclEventId::MenuItemChecked:
-            case VclEventId::MenuItemUnchecked:
-            case VclEventId::MenuShow:
-            case VclEventId::MenuHide:
-            break;
-
-            default:    OSL_FAIL( "MenuEventListener - Unknown event!" );
-       }
-    }
+        }
+        break;
+
+        // ignore accessibility events
+        case VclEventId::MenuEnable:
+        case VclEventId::MenuInsertItem:
+        case VclEventId::MenuRemoveItem:
+        case VclEventId::MenuSubmenuActivate:
+        case VclEventId::MenuSubmenuDeactivate:
+        case VclEventId::MenuSubmenuChanged:
+        case VclEventId::MenuDehighlight:
+        case VclEventId::MenuDisable:
+        case VclEventId::MenuItemTextChanged:
+        case VclEventId::MenuItemChecked:
+        case VclEventId::MenuItemUnchecked:
+        case VclEventId::MenuShow:
+        case VclEventId::MenuHide:
+        break;
+
+        default:    OSL_FAIL( "MenuEventListener - Unknown event!" );
+   }
 }