clang-tidy readability-redundant-control-flow

Change-Id: I832f7ef0f1bd55e365db7e49823fe8bc30390c04
Reviewed-on: https://gerrit.libreoffice.org/38215
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 3 insertions, 13 deletions

diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 04944c370d0d..43d9f428cb37 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -127,7 +127,6 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int3
 void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType )
 {
     m_aAttrFieldType.push_back(nAttrFieldType);
-    return;
 }
 
 void SwAccessiblePortionData::Special(
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 74bfe7371592..491ce495e59c 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -390,8 +390,6 @@ void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject
     }
 
     mpPauseThreadStarting = new SwPauseThreadStarting();
-
-    return;
 }
 
 void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObject& )
@@ -402,8 +400,7 @@ void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObjec
         mpPauseThreadStarting = nullptr;
     }
 
-    return;
-}
+    }
 
 void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObject& )
 {
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 8aafdb2df7f1..8a777c49b9ba 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -516,7 +516,7 @@ OUString SwSetExpFieldType::GetName() const
 
 void SwSetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* )
 {
-    return;     // do not expand further
+    // do not expand further
 }
 
 void SwSetExpFieldType::SetSeqFormat(sal_uLong nFormat)
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 1477ea9d0ef2..4762a1950faa 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -783,7 +783,6 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDea
     (void)nRstHeight;
 #endif
     mbInFootnoteConnect = false;
-    return;
 }
 
 /**
diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx
index 080a0081bedf..da347c2801b9 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -66,7 +66,7 @@ SwUnoCursor::DoSetBidiLevelLeftRight( bool &, bool, bool )
 
 void SwUnoCursor::DoSetBidiLevelUpDown()
 {
-    return; // not for uno cursor
+    // not for uno cursor
 }
 
 bool SwUnoCursor::IsSelOvr( SwCursorSelOverFlags eFlags )
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index b3a6c497c7e6..86b46af7d51b 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -473,8 +473,6 @@ void SAL_CALL SwXTextMarkup::commitMultiTextMarkup(
 
     if( bRepaint )
         finishGrammarCheck(*m_pImpl->m_pTextNode);
-
-    return;
 }
 
 void SwXTextMarkup::Impl::Modify( const SfxPoolItem* /*pOld*/, const SfxPoolItem* /*pNew*/ )
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index e0d11151b90d..079f764ea2b2 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -65,8 +65,6 @@ void SwViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions)
     }
 
     PrepareForPrint( rPrintOptions );
-
-    return;
 }
 
 /// print brochure
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index b8b5eac1853e..640cff74020f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2775,7 +2775,6 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
     p->pMemPos = nullptr;
     p->nSprmsLen = 0;
     p->bRealLineEnd = false;
-    return;
 }
 
 long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen )