From 29489b33b435683021b72cb2bce27aba8cb7a430 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 21 Oct 2021 12:31:03 +0200
Subject: loplugin:flatten

Change-Id: I3b4226a9d089ec9aedab95d96e50a068f57a76c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123991
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 framework/source/uielement/toolbarmanager.cxx | 60 +++++++++++++--------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'framework')

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 857d797bd542..ddec6fb528d7 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1758,26 +1758,26 @@ void ToolBarManager::HandleClick(ClickAction eClickAction)
 
     ToolBoxItemId nId( m_pImpl->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
-    if ( pIter != m_aControllerMap.end() )
-    {
-        Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
+    if ( pIter == m_aControllerMap.end() )
+        return;
 
-        if ( xController.is() )
+    Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
+
+    if ( xController.is() )
+    {
+        switch (eClickAction)
         {
-            switch (eClickAction)
-            {
-                case ClickAction::Click:
-                    xController->click();
-                    break;
+            case ClickAction::Click:
+                xController->click();
+                break;
 
-                case ClickAction::DblClick:
-                    xController->doubleClick();
-                    break;
+            case ClickAction::DblClick:
+                xController->doubleClick();
+                break;
 
-                case ClickAction::Execute:
-                    xController->execute(0);
-                    break;
-            }
+            case ClickAction::Execute:
+                xController->execute(0);
+                break;
         }
     }
 }
@@ -1804,22 +1804,22 @@ void ToolBarManager::OnDropdownClick(bool bCreatePopupWindow)
 
     ToolBoxItemId nId( m_pImpl->GetCurItemId() );
     ToolBarControllerMap::const_iterator pIter = m_aControllerMap.find( nId );
-    if ( pIter != m_aControllerMap.end() )
-    {
-        Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
+    if ( pIter == m_aControllerMap.end() )
+        return;
 
-        if ( xController.is() )
+    Reference< XToolbarController > xController( pIter->second, UNO_QUERY );
+
+    if ( xController.is() )
+    {
+        if (bCreatePopupWindow)
         {
-            if (bCreatePopupWindow)
-            {
-                Reference< XWindow > xWin = xController->createPopupWindow();
-                if ( xWin.is() )
-                    xWin->setFocus();
-            }
-            else
-            {
-                xController->click();
-            }
+            Reference< XWindow > xWin = xController->createPopupWindow();
+            if ( xWin.is() )
+                xWin->setFocus();
+        }
+        else
+        {
+            xController->click();
         }
     }
 }
-- 
cgit