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>

6 files changed, 0 insertions, 13 deletions

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 713494c640b3..c1570b56855e 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1415,8 +1415,6 @@ static void GetKern(TrueTypeFont *ttf)
   badtable:
     ttf->kerntype = KT_NONE;
     ttf->kerntables = nullptr;
-
-    return;
 }
 
 /*- Public functions */
@@ -1734,7 +1732,6 @@ void CloseTTFont(TrueTypeFont *ttf)
     free(ttf->kerntables);
 
     free(ttf);
-    return;
 }
 
 int GetTTGlyphPoints(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPoint **pointArray)
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index d62ca0ad75bf..0d6570d4dc74 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -397,8 +397,6 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data)
     preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, nullptr);
     XSetICValues(ic, XNPreeditAttributes, preedit_attr, nullptr);
     XFree(preedit_attr);
-
-    return;
 }
 
 // iv. preedit caret callback
@@ -463,13 +461,11 @@ IsControlCode(sal_Unicode nChar)
 void
 StatusStartCallback (XIC, XPointer, XPointer)
 {
-    return;
 }
 
 void
 StatusDoneCallback (XIC, XPointer, XPointer)
 {
-    return;
 }
 
 void
@@ -513,7 +509,6 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data)
             call_data->type == XIMBitmapType ? "XIMBitmapType" : OString::number(call_data->type).getStr() );
     }
 #endif
-    return;
 }
 
 // vii. destroy callbacks: internally disable all IC/IM calls
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 6b6b1442778a..18eea3f44722 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -680,8 +680,6 @@ void PrintFontManager::addFontconfigDir( const OString& rDirName )
         if( !bCfgOk )
             fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
     }
-
-    return;
 }
 
 static void addtopattern(FcPattern *pPattern,
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 84b3cfd56a89..b1df96613a53 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -549,7 +549,6 @@ void PrintFontManager::analyzeSfntFamilyName( void* pTTFont, ::std::list< OUStri
             if( *it != aFamily )
                 rNames.push_back( *it );
     }
-    return;
 }
 
 bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 1feccabbd013..4674ae771182 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -537,7 +537,6 @@ void PspSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics )
         delete pGraphics;
         m_pGraphics = nullptr;
     }
-    return;
 }
 
 bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup )
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f3c47a661d49..1744dc6e06bc 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2372,7 +2372,6 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
     }
     else
         mpInputContext->Map( this );
-    return;
 }
 
 void X11SalFrame::EndExtTextInput( EndExtTextInputFlags )