loplugin:flatten in sw/uibase/fldui..sw/uibase/ribbar

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

1 files changed, 21 insertions, 21 deletions

diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 8ae9fe5d087d..de00c7fc7108 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -155,19 +155,19 @@ void SwInputWindow::dispose()
 
 void SwInputWindow::CleanupUglyHackWithUndo()
 {
-    if (m_bResetUndo)
+    if (!m_bResetUndo)
+        return;
+
+    if (pWrtShell)
     {
-        if (pWrtShell)
+        DelBoxContent();
+        pWrtShell->DoUndo(m_bDoesUndo);
+        if (m_bCallUndo)
         {
-            DelBoxContent();
-            pWrtShell->DoUndo(m_bDoesUndo);
-            if (m_bCallUndo)
-            {
-                pWrtShell->Undo();
-            }
+            pWrtShell->Undo();
         }
-        m_bResetUndo = false; // #i117122# once is enough :)
     }
+    m_bResetUndo = false; // #i117122# once is enough :)
 }
 
 void SwInputWindow::Resize()
@@ -354,22 +354,22 @@ void  SwInputWindow::ApplyFormula()
 
 void  SwInputWindow::CancelFormula()
 {
-    if(pView)
-    {
-        pView->GetViewFrame()->GetDispatcher()->Lock( false );
-        pView->GetEditWin().LockKeyInput(false);
-        CleanupUglyHackWithUndo();
-        pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
+    if(!pView)
+        return;
 
-        if( bDelSel )
-            pWrtShell->EnterStdMode();
+    pView->GetViewFrame()->GetDispatcher()->Lock( false );
+    pView->GetEditWin().LockKeyInput(false);
+    CleanupUglyHackWithUndo();
+    pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
 
-        pWrtShell->EndSelTableCells();
+    if( bDelSel )
+        pWrtShell->EnterStdMode();
 
-        pView->GetEditWin().GrabFocus();
+    pWrtShell->EndSelTableCells();
 
-        pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SfxCallMode::ASYNCHRON);
-    }
+    pView->GetEditWin().GrabFocus();
+
+    pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SfxCallMode::ASYNCHRON);
 }
 
 const sal_Unicode CH_LRE = 0x202a;