loplugin:flatten in sw/uibase/utl..sw/uibase/wrtsh

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

1 files changed, 17 insertions, 17 deletions

diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index a5c1ecbb7299..dc47cb73acdb 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -478,26 +478,26 @@ void SwWrtShell::ExtSelWrd(const Point *pPt, bool )
 
     SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent); // restore the saved cursor
 
-    if( bMoveCursor )
+    if( !bMoveCursor )
+        return;
+
+    // select to Top but cursor select to Bottom? or
+    // select to Bottom but cursor select to Top?       --> swap the cursor
+    if( bToTop )
+        SwapPam();
+
+    SwCursorShell::Push();                // save cur cursor
+    if( SwCursorShell::SelectWord( pPt )) // select the current word
     {
-        // select to Top but cursor select to Bottom? or
-        // select to Bottom but cursor select to Top?       --> swap the cursor
         if( bToTop )
             SwapPam();
-
-        SwCursorShell::Push();                // save cur cursor
-        if( SwCursorShell::SelectWord( pPt )) // select the current word
-        {
-            if( bToTop )
-                SwapPam();
-            Combine();
-        }
-        else
-        {
-            SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent);
-            if( bToTop )
-                SwapPam();
-        }
+        Combine();
+    }
+    else
+    {
+        SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent);
+        if( bToTop )
+            SwapPam();
     }
 }