loplugin:flatten in vcl/window

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

1 files changed, 27 insertions, 28 deletions

diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx
index 1c042017a3fc..c8c3c4bd2288 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -72,39 +72,38 @@ static void CreateNotebookBarToolBox(vcl::Window* pNotebookbarToolBox,
 {
     sal_uInt16 nItemId = 0;
     ToolBox* pToolbox = dynamic_cast<ToolBox*>(pNotebookbarToolBox);
-    if (pToolbox)
+    if (!pToolbox)
+        return;
+
+    pToolbox->InsertSeparator();
+    pToolbox->Show();
+    Size aSize(0, 0);
+    Image sImage;
+    pToolbox->InsertItem(aAddonNotebookBarItem.sCommandURL, m_xFrame, ToolBoxItemBits::NONE, aSize);
+    nItemId = pToolbox->GetItemId(aAddonNotebookBarItem.sCommandURL);
+    pToolbox->SetItemCommand(nItemId, aAddonNotebookBarItem.sCommandURL);
+    pToolbox->SetQuickHelpText(nItemId, aAddonNotebookBarItem.sLabel);
+
+    if (nIter < aImageVec.size())
     {
-        pToolbox->InsertSeparator();
-        pToolbox->Show();
-        Size aSize(0, 0);
-        Image sImage;
-        pToolbox->InsertItem(aAddonNotebookBarItem.sCommandURL, m_xFrame, ToolBoxItemBits::NONE,
-                             aSize);
-        nItemId = pToolbox->GetItemId(aAddonNotebookBarItem.sCommandURL);
-        pToolbox->SetItemCommand(nItemId, aAddonNotebookBarItem.sCommandURL);
-        pToolbox->SetQuickHelpText(nItemId, aAddonNotebookBarItem.sLabel);
-
-        if (nIter < aImageVec.size())
+        sImage = aImageVec[nIter];
+        if (!sImage)
         {
-            sImage = aImageVec[nIter];
-            if (!sImage)
-            {
-                sImage = vcl::CommandInfoProvider::GetImageForCommand(
-                    aAddonNotebookBarItem.sImageIdentifier, m_xFrame);
-            }
+            sImage = vcl::CommandInfoProvider::GetImageForCommand(
+                aAddonNotebookBarItem.sImageIdentifier, m_xFrame);
         }
+    }
 
-        if (aAddonNotebookBarItem.sStyle == STYLE_TEXT)
-            pToolbox->SetItemText(nItemId, aAddonNotebookBarItem.sLabel);
-        else if (aAddonNotebookBarItem.sStyle == STYLE_ICON)
-            pToolbox->SetItemImage(nItemId, sImage);
-        else
-        {
-            pToolbox->SetItemText(nItemId, aAddonNotebookBarItem.sLabel);
-            pToolbox->SetItemImage(nItemId, sImage);
-        }
-        pToolbox->Show();
+    if (aAddonNotebookBarItem.sStyle == STYLE_TEXT)
+        pToolbox->SetItemText(nItemId, aAddonNotebookBarItem.sLabel);
+    else if (aAddonNotebookBarItem.sStyle == STYLE_ICON)
+        pToolbox->SetItemImage(nItemId, sImage);
+    else
+    {
+        pToolbox->SetItemText(nItemId, aAddonNotebookBarItem.sLabel);
+        pToolbox->SetItemImage(nItemId, sImage);
     }
+    pToolbox->Show();
 }
 
 NotebookBarAddonsMerger::NotebookBarAddonsMerger() {}