loplugin:unusedreturntypes

and clean up the python script

Change-Id: I0a7068153290fbbb60bfeb4c8bda1c24d514500f
Reviewed-on: https://gerrit.libreoffice.org/25439
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 23 insertions, 40 deletions

diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 6f71cbacc2ad..d22d351346db 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -353,7 +353,7 @@ public:
                                 const PrinterBmp& rBitmap);
 
     // font and text handling
-    sal_uInt16      SetFont (
+    void            SetFont (
                              sal_Int32 nFontID,
                              sal_Int32 nPointHeight,
                              sal_Int32 nPointWidth,
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3101d98e5ffb..27e432278874 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2248,7 +2248,7 @@ LogicalFontInstance* PdfBuiltinFontFace::CreateFontInstance( FontSelectPattern&
 }
 
 
-sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation )
+void PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation )
 {
     endPage();
     m_nCurrentPage = m_aPages.size();
@@ -2262,8 +2262,6 @@ sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, P
     appendDouble( 72.0/double(getReferenceDevice()->GetDPIX()), aBuf );
     aBuf.append( " w\n" );
     writeBuffer( aBuf.getStr(), aBuf.getLength() );
-
-    return m_nCurrentPage;
 }
 
 void PDFWriterImpl::endPage()
@@ -12204,22 +12202,20 @@ sal_Int32 PDFWriterImpl::registerDestReference( sal_Int32 nDestId, const Rectang
     return m_aDestinationIdTranslation[ nDestId ] = createDest( rRect, nPageNr, eType );
 }
 
-sal_Int32 PDFWriterImpl::setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
+void PDFWriterImpl::setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
 {
     if( nLinkId < 0 || nLinkId >= (sal_Int32)m_aLinks.size() )
-        return -1;
+        return;
     if( nDestId < 0 || nDestId >= (sal_Int32)m_aDests.size() )
-        return -2;
+        return;
 
     m_aLinks[ nLinkId ].m_nDest = nDestId;
-
-    return 0;
 }
 
-sal_Int32 PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL )
+void PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL )
 {
     if( nLinkId < 0 || nLinkId >= (sal_Int32)m_aLinks.size() )
-        return -1;
+        return;
 
     m_aLinks[ nLinkId ].m_nDest = -1;
 
@@ -12237,8 +12233,6 @@ sal_Int32 PDFWriterImpl::setLinkURL( sal_Int32 nLinkId, const OUString& rURL )
     m_xTrans->parseStrict( aURL );
 
     m_aLinks[ nLinkId ].m_aURL  = aURL.Complete;
-
-    return 0;
 }
 
 void PDFWriterImpl::setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId )
@@ -12260,17 +12254,14 @@ sal_Int32 PDFWriterImpl::createOutlineItem( sal_Int32 nParent, const OUString& r
     return nNewItem;
 }
 
-sal_Int32 PDFWriterImpl::setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent )
+void PDFWriterImpl::setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent )
 {
     if( nItem < 1 || nItem >= (sal_Int32)m_aOutline.size() )
-        return -1;
-
-    int nRet = 0;
+        return;
 
     if( nNewParent < 0 || nNewParent >= (sal_Int32)m_aOutline.size() || nNewParent == nItem )
     {
         nNewParent = 0;
-        nRet = -2;
     }
     // remove item from previous parent
     sal_Int32 nParentID = m_aOutline[ nItem ].m_nParentID;
@@ -12291,27 +12282,23 @@ sal_Int32 PDFWriterImpl::setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewPa
 
     // insert item to new parent's list of children
     m_aOutline[ nNewParent ].m_aChildren.push_back( nItem );
-
-    return nRet;
 }
 
-sal_Int32 PDFWriterImpl::setOutlineItemText( sal_Int32 nItem, const OUString& rText )
+void PDFWriterImpl::setOutlineItemText( sal_Int32 nItem, const OUString& rText )
 {
     if( nItem < 1 || nItem >= (sal_Int32)m_aOutline.size() )
-        return -1;
+        return;
 
     m_aOutline[ nItem ].m_aTitle = psp::WhitespaceToSpace( rText );
-    return 0;
 }
 
-sal_Int32 PDFWriterImpl::setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID )
+void PDFWriterImpl::setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID )
 {
     if( nItem < 1 || nItem >= (sal_Int32)m_aOutline.size() ) // item does not exist
-        return -1;
+        return;
     if( nDestID < 0 || nDestID >= (sal_Int32)m_aDests.size() ) // dest does not exist
-        return -2;
+        return;
     m_aOutline[nItem].m_nDestID = nDestID;
-    return 0;
 }
 
 const sal_Char* PDFWriterImpl::getStructureTag( PDFWriter::StructElement eType )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index c8ebcac959e9..506187fa2e3d 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1014,7 +1014,7 @@ public:
     OutputDevice* getReferenceDevice();
 
     /* document structure */
-    sal_Int32 newPage( sal_Int32 nPageWidth , sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation );
+    void newPage( sal_Int32 nPageWidth , sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation );
     bool emit();
     const std::set< PDFWriter::ErrorCode > & getErrors() const { return m_aErrors;}
     void insertError( PDFWriter::ErrorCode eErr ) { m_aErrors.insert( eErr ); }
@@ -1184,15 +1184,15 @@ public:
     sal_Int32 createLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 );
     sal_Int32 createDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
     sal_Int32 registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
-    sal_Int32 setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
-    sal_Int32 setLinkURL( sal_Int32 nLinkId, const OUString& rURL );
-    void setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId );
+    void      setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
+    void      setLinkURL( sal_Int32 nLinkId, const OUString& rURL );
+    void      setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId );
 
     // outline
     sal_Int32 createOutlineItem( sal_Int32 nParent = 0, const OUString& rText = OUString(), sal_Int32 nDestID = -1 );
-    sal_Int32 setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
-    sal_Int32 setOutlineItemText( sal_Int32 nItem, const OUString& rText );
-    sal_Int32 setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
+    void      setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
+    void      setOutlineItemText( sal_Int32 nItem, const OUString& rText );
+    void      setOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
 
     // notes
     void createNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr = -1 );
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index 171b569a70b8..0117d0e0f1a5 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.cxx
@@ -46,7 +46,7 @@ IMPL_LINK_NOARG_TYPED(SolarThreadExecutor, worker, void*, void)
     }
 }
 
-long SolarThreadExecutor::impl_execute()
+void SolarThreadExecutor::impl_execute()
 {
     if( ::osl::Thread::getCurrentIdentifier() == Application::GetMainThreadIdentifier() )
     {
@@ -68,7 +68,6 @@ long SolarThreadExecutor::impl_execute()
         else
             osl_waitCondition( m_aFinish, nullptr );
     }
-    return m_nReturn;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index 93765d2c4078..d78207744085 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -100,8 +100,7 @@ PrinterGfx::PSUploadPS1Font (sal_Int32 nFontID)
  * implement text handling printer routines,
  */
 
-sal_uInt16
-PrinterGfx::SetFont(
+void PrinterGfx::SetFont(
                     sal_Int32 nFontID,
                     sal_Int32 nHeight,
                     sal_Int32 nWidth,
@@ -122,8 +121,6 @@ PrinterGfx::SetFont(
     maVirtualStatus.mbArtBold         = bArtBold;
     mnTextAngle                       = nAngle;
     mbTextVertical                    = bVertical;
-
-    return 0;
 }
 
 void PrinterGfx::drawGlyphs(