[Libreoffice-commits] core.git: basegfx/source canvas/source compilerplugins/clang connectivity/source desktop/inc desktop/source fpicker/source include/basegfx include/vcl sc/source sd/source sfx2/source svtools/source sw/inc sw/source vcl/source vcl/workben

Noel Grandin noel at peralex.com
Wed Jan 20 23:19:13 PST 2016


 basegfx/source/polygon/b2dpolypolygontools.cxx                    |   29 -----
 basegfx/source/tools/canvastools.cxx                              |    8 -
 canvas/source/vcl/canvasbitmaphelper.hxx                          |    2 
 canvas/source/vcl/canvashelper.hxx                                |    2 
 compilerplugins/clang/unusedmethods.py                            |   11 +
 connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx           |   56 ----------
 connectivity/source/drivers/mork/MPreparedStatement.cxx           |    6 -
 connectivity/source/drivers/mork/MPreparedStatement.hxx           |    2 
 connectivity/source/inc/java/sql/DriverPropertyInfo.hxx           |    4 
 desktop/inc/app.hxx                                               |    4 
 desktop/source/app/app.cxx                                        |    3 
 fpicker/source/office/OfficeFilePicker.cxx                        |    7 -
 include/basegfx/color/bcolor.hxx                                  |    3 
 include/basegfx/polygon/b2dpolypolygontools.hxx                   |    4 
 include/basegfx/range/b2ibox.hxx                                  |   18 ---
 include/basegfx/tools/canvastools.hxx                             |   13 --
 include/basegfx/tools/rectcliptools.hxx                           |   18 ---
 include/vcl/pdfwriter.hxx                                         |   35 +-----
 include/vcl/slider.hxx                                            |    4 
 include/vcl/svapp.hxx                                             |    4 
 sc/source/filter/html/htmlexp.cxx                                 |    4 
 sc/source/filter/inc/htmlexp.hxx                                  |    2 
 sc/source/filter/inc/rtfexp.hxx                                   |    2 
 sc/source/filter/rtf/rtfexp.cxx                                   |    3 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx     |   14 --
 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx |    4 
 sfx2/source/dialog/templdlg.cxx                                   |    6 -
 sfx2/source/inc/templdgi.hxx                                      |    2 
 svtools/source/contnr/svimpbox.cxx                                |    6 -
 svtools/source/inc/svimpbox.hxx                                   |    2 
 svtools/source/uno/treecontrolpeer.cxx                            |    8 -
 sw/inc/dbmgr.hxx                                                  |    7 -
 sw/inc/doc.hxx                                                    |    4 
 sw/inc/editsh.hxx                                                 |    4 
 sw/inc/expfld.hxx                                                 |    2 
 sw/inc/fesh.hxx                                                   |    2 
 sw/inc/ndtxt.hxx                                                  |    2 
 sw/inc/node.hxx                                                   |    2 
 sw/inc/pam.hxx                                                    |    2 
 sw/inc/shellio.hxx                                                |    2 
 sw/inc/tox.hxx                                                    |    6 -
 sw/inc/txtftn.hxx                                                 |    2 
 sw/inc/view.hxx                                                   |    2 
 sw/inc/viewsh.hxx                                                 |    2 
 sw/source/core/crsr/pam.cxx                                       |    3 
 sw/source/core/doc/docruby.cxx                                    |    4 
 sw/source/core/doc/doctxm.cxx                                     |    9 -
 sw/source/core/docnode/node.cxx                                   |    3 
 sw/source/core/edit/editsh.cxx                                    |    3 
 sw/source/core/edit/edtox.cxx                                     |    4 
 sw/source/core/fields/expfld.cxx                                  |    7 -
 sw/source/core/frmedt/feshview.cxx                                |    5 
 sw/source/core/inc/SwXMLBlockExport.hxx                           |    2 
 sw/source/core/inc/frmtool.hxx                                    |    4 
 sw/source/core/inc/scriptinfo.hxx                                 |    3 
 sw/source/core/inc/txtfrm.hxx                                     |    2 
 sw/source/core/layout/frmtool.cxx                                 |    6 -
 sw/source/core/swg/SwXMLBlockExport.cxx                           |    3 
 sw/source/core/swg/swblocks.cxx                                   |    5 
 sw/source/core/text/frmform.cxx                                   |    4 
 sw/source/core/text/itrtxt.cxx                                    |    3 
 sw/source/core/text/itrtxt.hxx                                    |    2 
 sw/source/core/text/porlay.cxx                                    |    3 
 sw/source/core/tox/tox.cxx                                        |    4 
 sw/source/core/txtnode/atrftn.cxx                                 |   10 -
 sw/source/core/txtnode/ndtxt.cxx                                  |    4 
 sw/source/core/view/vprint.cxx                                    |    3 
 sw/source/filter/html/htmlform.cxx                                |    5 
 sw/source/filter/html/htmlnum.hxx                                 |    4 
 sw/source/uibase/dbui/dbmgr.cxx                                   |   14 --
 sw/source/uibase/uiview/viewmdi.cxx                               |    4 
 vcl/source/app/svapp.cxx                                          |    8 -
 vcl/source/control/slider.cxx                                     |   14 +-
 vcl/source/gdi/pdfwriter.cxx                                      |   24 ++--
 vcl/workben/outdevgrind.cxx                                       |    5 
 75 files changed, 128 insertions(+), 371 deletions(-)

New commits:
commit 90d892664a6c49a8ae25a72ddccf54dba9d0e429
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Jan 20 16:36:19 2016 +0200

    loplugin: unused return values
    
    Change-Id: I4eb1f0c9245c04058fd5e47046f043f8840a79c7
    Reviewed-on: https://gerrit.libreoffice.org/21628
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index b150776..45c54f5 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -170,35 +170,6 @@ namespace basegfx
             }
         }
 
-        B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount)
-        {
-            if(rCandidate.areControlPointsUsed())
-            {
-                const sal_uInt32 nPolygonCount(rCandidate.count());
-                B2DPolyPolygon aRetval;
-
-                for(sal_uInt32 a(0L); a < nPolygonCount; a++)
-                {
-                    const B2DPolygon aCandidate(rCandidate.getB2DPolygon(a));
-
-                    if(aCandidate.areControlPointsUsed())
-                    {
-                        aRetval.append(tools::adaptiveSubdivideByCount(aCandidate, nCount));
-                    }
-                    else
-                    {
-                        aRetval.append(aCandidate);
-                    }
-                }
-
-                return aRetval;
-            }
-            else
-            {
-                return rCandidate;
-            }
-        }
-
         bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder)
         {
             const sal_uInt32 nPolygonCount(rCandidate.count());
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index 75534f6..a4a47ca 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -471,14 +471,6 @@ namespace basegfx
                                         rRect.Y + rRect.Height );
         }
 
-        ::basegfx::B2IBox b2ISurroundingBoxFromB2DRange( const ::basegfx::B2DRange& rRange )
-        {
-            return ::basegfx::B2IBox( static_cast<sal_Int32>( floor(rRange.getMinX()) ),
-                                      static_cast<sal_Int32>( floor(rRange.getMinY()) ),
-                                      static_cast<sal_Int32>( ceil(rRange.getMaxX()) ),
-                                      static_cast<sal_Int32>( ceil(rRange.getMaxY()) ) );
-        }
-
         ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange )
         {
             return ::basegfx::B2IRange( static_cast<sal_Int32>( floor(rRange.getMinX()) ),
diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 546825f..1b7cf7f 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.hxx
@@ -82,7 +82,7 @@ namespace vclcanvas
 
         css::geometry::IntegerSize2D getSize();
 
-        css::uno::Reference< css::rendering::XBitmapCanvas > queryBitmapCanvas();
+        void queryBitmapCanvas();
 
         css::uno::Reference< css::rendering::XBitmap >
             getScaledBitmap( const css::geometry::RealSize2D&  newSize,
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 80f4ebb..332203c 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -233,7 +233,7 @@ namespace vclcanvas
 
         css::geometry::IntegerSize2D getSize();
 
-        css::uno::Reference< css::rendering::XBitmapCanvas > queryBitmapCanvas();
+        void queryBitmapCanvas();
 
         css::uno::Reference< css::rendering::XBitmap >
             getScaledBitmap( const css::geometry::RealSize2D&  newSize,
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index d5c7946..2f94f16 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -241,10 +241,10 @@ def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
 tmp1list = sorted(tmp1set, key=lambda v: natural_sort_key(v[1]))
 
 # print out the results
-for t in tmp1list:
-    print t[1]
-    print "    ", t[0]
-sys.exit(0)
+#for t in tmp1list:
+#    print t[1]
+#    print "    ", t[0]
+#sys.exit(0)
 
 # -------------------------------------------
 # Do the "unused return types" part
@@ -261,6 +261,9 @@ for d in definitionSet:
         continue
     if d[0] == "void":
         continue
+    # ignore bool returns, provides important documentation in the code
+    if d[0] == "_Bool":
+        continue
     # ignore UNO constructor method entrypoints
     if "_get_implementation" in d[1] or "_getFactory" in d[1]:
         continue
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 12e33af..1c8d6f9 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -48,45 +48,6 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
 }
 
 
-OUString java_sql_DriverPropertyInfo::name()
-{
-    OUString aStr;
-    SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
-    {
-        jfieldID id = t.pEnv->GetFieldID(getMyClass(),"name","Ljava/lang/String;");
-        if(id)
-            aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
-    } //t.pEnv
-    return aStr;
-}
-
-OUString java_sql_DriverPropertyInfo::description()
-{
-    OUString aStr;
-    SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
-    {
-        jfieldID id = t.pEnv->GetFieldID(getMyClass(),"description","Ljava/lang/String;");
-        if(id)
-            aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
-    } //t.pEnv
-    return aStr;
-}
-
-OUString java_sql_DriverPropertyInfo::value()
-{
-    OUString aStr;
-    SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
-    {
-        jfieldID id = t.pEnv->GetFieldID(getMyClass(),"value","Ljava/lang/String;");
-        if(id)
-            aStr = JavaString2String(t.pEnv, static_cast<jstring>(t.pEnv->GetObjectField( object, id)));
-    } //t.pEnv
-    return aStr;
-}
-
 bool java_sql_DriverPropertyInfo::required()
 {
     jboolean out(0);
@@ -100,21 +61,4 @@ bool java_sql_DriverPropertyInfo::required()
     return out;
 }
 
-Sequence< OUString> java_sql_DriverPropertyInfo::choices()
-{
-    SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-
-    {
-        jfieldID id = t.pEnv->GetFieldID(getMyClass(),"choices","[Ljava/lang/String;");
-        if(id)
-        {
-            const java_lang_String * pEmpty = nullptr;
-            const OUString * pEmpty2 = nullptr;
-            return copyArrayAndDelete(t.pEnv, static_cast<jobjectArray>(t.pEnv->GetObjectField( object, id)), pEmpty2, pEmpty);
-        }
-    } //t.pEnv
-    return Sequence< OUString>();
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 430c01f..edd87db 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -387,11 +387,8 @@ ORowSetValue& x)
 }
 
 
-size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+void OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
-    // Count of the newly added Parameters
-    size_t nParameter = m_xParamColumns->get().size()+1;
-
     OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter");
     OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree");
 
@@ -431,7 +428,6 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
                                                     ,OUString()
                                                     ,OUString());
     m_xParamColumns->get().push_back(xParaColumn);
-    return nParameter;
 }
 
 void OPreparedStatement::describeColumn(OSQLParseNode*
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index 9e7e7f6..305977b 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -71,7 +71,7 @@ namespace connectivity
             void checkAndResizeParameters(sal_Int32 parameterIndex);
             void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
 
-            size_t AddParameter(connectivity::OSQLParseNode * pParameter,
+            void AddParameter(connectivity::OSQLParseNode * pParameter,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
             void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
             void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 3380ef5..db86f2a 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -40,11 +40,7 @@ namespace connectivity
         // A ctor that is needed for returning the object
         java_sql_DriverPropertyInfo( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
-        OUString name();
-        OUString description();
-        OUString value();
         bool        required();
-        ::com::sun::star::uno::Sequence< OUString> choices();
     };
 }
 
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index d07d285..89b8803 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -75,8 +75,8 @@ class Desktop : public Application
         virtual void            Init() override;
         virtual void            InitFinished() override;
         virtual void            DeInit() override;
-        virtual bool        QueryExit() override;
-        virtual sal_uInt16      Exception(sal_uInt16 nError) override;
+        virtual bool            QueryExit() override;
+        virtual void            Exception(sal_uInt16 nError) override;
         virtual void            OverrideSystemSettings( AllSettings& rSettings ) override;
         virtual void            AppEvent( const ApplicationEvent& rAppEvent ) override;
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index da4f412..11f25e6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1184,7 +1184,7 @@ void restartOnMac(bool passArguments) {
 
 }
 
-sal_uInt16 Desktop::Exception(sal_uInt16 nError)
+void Desktop::Exception(sal_uInt16 nError)
 {
     // protect against recursive calls
     static bool bInException = false;
@@ -1250,7 +1250,6 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
     }
 
     OSL_ASSERT(false); // unreachable
-    return 0;
 }
 
 void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index a4d9dd3..170bf40 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -78,10 +78,8 @@ public:
     bool            hasSubFilters( ) const;
 
     /** retrieves the filters belonging to the entry
-    @return
-        the number of sub filters
     */
-    sal_Int32           getSubFilters( UnoFilterList& _rSubFilterList );
+    void            getSubFilters( UnoFilterList& _rSubFilterList );
 
     // helpers for iterating the sub filters
     const UnoFilterEntry*   beginSubFilters() const { return m_aSubFilters.getConstArray(); }
@@ -104,10 +102,9 @@ bool FilterEntry::hasSubFilters( ) const
 }
 
 
-sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
+void FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
 {
     _rSubFilterList = m_aSubFilters;
-    return m_aSubFilters.getLength();
 }
 
 struct ElementEntry_Impl
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index ae6fdf2..a2f067a 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -174,12 +174,11 @@ namespace basegfx
             return *this;
         }
 
-        BColor& invert()
+        void invert()
         {
             mfX = 1.0 - mfX;
             mfY = 1.0 - mfY;
             mfZ = 1.0 - mfZ;
-            return *this;
         }
 
         static const BColor& getEmptyBColor()
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 6c40670..f069bc8 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -60,10 +60,6 @@ namespace basegfx
         // is created.
         BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByAngle(const B2DPolyPolygon& rCandidate, double fAngleBound = 0.0);
 
-        // Subdivide all contained curves. Use nCount divisions if given. Else, a convenient one
-        // is created.
-        BASEGFX_DLLPUBLIC B2DPolyPolygon adaptiveSubdivideByCount(const B2DPolyPolygon& rCandidate, sal_uInt32 nCount = 0L);
-
         // isInside test for B2dPoint. On border is not inside as long as not true is given
         // in bWithBorder flag. It is assumed that the orientations of the given polygon are correct.
         BASEGFX_DLLPUBLIC bool isInside(const B2DPolyPolygon& rCandidate, const B2DPoint& rPoint, bool bWithBorder = false);
diff --git a/include/basegfx/range/b2ibox.hxx b/include/basegfx/range/b2ibox.hxx
index b5c4d33..ab80e9c 100644
--- a/include/basegfx/range/b2ibox.hxx
+++ b/include/basegfx/range/b2ibox.hxx
@@ -152,24 +152,6 @@ namespace basegfx
             return maRangeY.getRange();
         }
 
-        /// get lower bound of the set. returns arbitrary values for empty sets.
-        B2IPoint getMinimum() const
-        {
-            return B2IPoint(
-                maRangeX.getMinimum(),
-                maRangeY.getMinimum()
-                );
-        }
-
-        /// get upper bound of the set. returns arbitrary values for empty sets.
-        B2IPoint getMaximum() const
-        {
-            return B2IPoint(
-                maRangeX.getMaximum(),
-                maRangeY.getMaximum()
-                );
-        }
-
         /// yields true if point is contained in set
         bool isInside(const B2ITuple& rTuple) const
         {
diff --git a/include/basegfx/tools/canvastools.hxx b/include/basegfx/tools/canvastools.hxx
index 79b72f2..9537b64 100644
--- a/include/basegfx/tools/canvastools.hxx
+++ b/include/basegfx/tools/canvastools.hxx
@@ -156,19 +156,6 @@ namespace basegfx
          */
         BASEGFX_DLLPUBLIC ::basegfx::B2IRange   b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange );
 
-        /** Return smalltest integer box, which completely contains
-            given floating point range.
-
-            @param rRange
-            Input range. Values must be within the representable
-            bounds of sal_Int32
-
-            @return the closest integer box, which completely contains
-            rRange. Note that this box will contain all pixel affected
-            by a polygon fill operation over the input range.
-         */
-        BASEGFX_DLLPUBLIC ::basegfx::B2IBox     b2ISurroundingBoxFromB2DRange( const ::basegfx::B2DRange& rRange );
-
         /** Return smalltest B2DRange with integer values, which
             completely contains given floating point range.
 
diff --git a/include/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx
index 2d45ad1..81416a4 100644
--- a/include/basegfx/tools/rectcliptools.hxx
+++ b/include/basegfx/tools/rectcliptools.hxx
@@ -70,24 +70,6 @@ namespace basegfx
             return clip;
         }
 
-        /** Determine number of clip planes hit by given clip mask
-
-            This method returns the number of one bits in the four
-            least significant bits of the argument, which amounts to
-            the number of clip planes hit within the
-            getCohenSutherlandClipFlags() method.
-         */
-        inline sal_uInt32 getNumberOfClipPlanes( sal_uInt32 nFlags )
-        {
-            // classic bit count algo, see e.g. Reingold, Nievergelt,
-            // Deo: Combinatorial Algorithms, Theory and Practice,
-            // Prentice-Hall 1977
-            nFlags = (nFlags & 0x05) + ((nFlags >> 1) & 0x05);
-            nFlags = (nFlags & 0x03) + (nFlags >> 2); // no need for &
-                                                      // 0x03, can't
-                                                      // overflow
-            return nFlags;
-        }
     }
 }
 
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index 9d7304d..697ae91 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -683,11 +683,8 @@ The following structure describes the permissions used in PDF security
         resets the graphics state: MapMode, Font
         Colors and other state information MUST
         be set again or are undefined.
-
-        @returns
-        returns the page id of the new page
     */
-    sal_Int32 NewPage( sal_Int32 nPageWidth = 0, sal_Int32 nPageHeight = 0, Orientation eOrientation = Inherit );
+    void NewPage( sal_Int32 nPageWidth = 0, sal_Int32 nPageHeight = 0, Orientation eOrientation = Inherit );
     /** Play a metafile like an outputdevice would do
     */
     struct PlayMetafileContext
@@ -959,12 +956,8 @@ The following structure describes the permissions used in PDF security
 
         @param nDestId
         the dest the link shall point to
-        @returns
-        0 for success
-        -1 in case the link id does not exist
-        -2 in case the dest id does not exist
     */
-    sal_Int32           SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
+    void           SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
     /** Set the URL for a link
         will change a dest type link to an URL type link if necessary
         @param nLinkId
@@ -974,12 +967,8 @@ The following structure describes the permissions used in PDF security
         the URL the link shall point to.
         The URL will be parsed (and corrected) by the com.sun.star.util.URLTransformer
         service; the result will then appear literally in the PDF file produced
-
-        @returns
-        0 for success
-        -1 in case the link id does not exist
     */
-    sal_Int32           SetLinkURL( sal_Int32 nLinkId, const OUString& rURL );
+    void           SetLinkURL( sal_Int32 nLinkId, const OUString& rURL );
     /** Resolve link in logical structure
 
         If a link is created after the corresponding visual appearance was drawn
@@ -1033,12 +1022,8 @@ The following structure describes the permissions used in PDF security
     @param nNewParent
     specifies which outline item will be the item's new parent.
     Use 0 for reparenting to top level.
-
-    @returns
-    -1 if the item does not exist
-    -2 if the new parent does not exist, item will be reparented to top level.
     */
-    sal_Int32 SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
+    void SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
 
     /** Set an outline item's title text
 
@@ -1047,12 +1032,8 @@ The following structure describes the permissions used in PDF security
 
     @param rText
     sets the title text of the item
-
-    @returns
-    0 if the item exists and the text was changed
-    -1 if the item does not exist
     */
-    sal_Int32 SetOutlineItemText( sal_Int32 nItem, const OUString& rText );
+    void SetOutlineItemText( sal_Int32 nItem, const OUString& rText );
 
     /** Set an outline item's destination
 
@@ -1061,12 +1042,8 @@ The following structure describes the permissions used in PDF security
 
     @param nDestID
     specifies the item's new destination
-
-    @returns
-    -1 if the item does not exist
-    -2 if the new dest does not exist, dest will remain unchanged
     */
-    sal_Int32 SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
+    void SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
 
     /** Create a new note on a page
 
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index e418357..cb0d226 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -75,8 +75,8 @@ private:
     SAL_DLLPRIVATE long ImplSlide( long nNewPos, bool bCallEndSlide );
     SAL_DLLPRIVATE long ImplDoAction( bool bCallEndSlide );
     SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true );
-    SAL_DLLPRIVATE long ImplDoSlide( long nNewPos );
-    SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType );
+    SAL_DLLPRIVATE void ImplDoSlide( long nNewPos );
+    SAL_DLLPRIVATE void ImplDoSlideAction( ScrollType eScrollType );
     SAL_DLLPRIVATE void ImplUpdateLinkedField();
 
 public:
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 5e4db81..2b7fe62 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -429,11 +429,9 @@ public:
 
      @param nError      The error code identifier
 
-     @returns sal_uInt16 value - if it is 0, then the error wasn't handled.
-
      @see Abort
     */
-    virtual sal_uInt16          Exception( sal_uInt16 nError );
+    virtual void          Exception( sal_uInt16 nError );
 
     /** Ends the program prematurely with an error message.
 
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 668c702..d6f2262 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -315,7 +315,7 @@ Size ScHTMLExport::MMToPixel( const Size& rSize )
     return aSize;
 }
 
-sal_uLong ScHTMLExport::Write()
+void ScHTMLExport::Write()
 {
     if (!mbSkipHeaderFooter)
     {
@@ -329,8 +329,6 @@ sal_uLong ScHTMLExport::Write()
     OUT_LF();
     if (!mbSkipHeaderFooter)
         TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_html );
-
-    return rStrm.GetError();
 }
 
 void ScHTMLExport::WriteHeader()
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index c53c6e1..5fc011e 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -178,7 +178,7 @@ public:
                         ScHTMLExport( SvStream&, const OUString&, ScDocument*, const ScRange&,
                                       bool bAll, const OUString& aStreamPath, const OUString& rFilterOptions );
     virtual             ~ScHTMLExport();
-    sal_uLong           Write();
+    void                Write();
     const OUString&     GetNonConvertibleChars() const
     {
         return aNonConvertibleChars;
diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx
index 73ab85d..853f8a6 100644
--- a/sc/source/filter/inc/rtfexp.hxx
+++ b/sc/source/filter/inc/rtfexp.hxx
@@ -35,7 +35,7 @@ public:
                         ScRTFExport( SvStream&, ScDocument*, const ScRange& );
     virtual             ~ScRTFExport();
 
-    sal_uLong               Write();
+    void                Write();
 };
 
 #endif // INCLUDED_SC_SOURCE_FILTER_INC_RTFEXP_HXX
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 057b9a5..b6ed3a4 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -60,7 +60,7 @@ ScRTFExport::~ScRTFExport()
     delete [] pCellX;
 }
 
-sal_uLong ScRTFExport::Write()
+void ScRTFExport::Write()
 {
     rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF );
     rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ANSI ).WriteCharPtr( SAL_NEWLINE_STRING );
@@ -74,7 +74,6 @@ sal_uLong ScRTFExport::Write()
     }
 
     rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING );
-    return rStrm.GetError();
 }
 
 void ScRTFExport::WriteTab( SCTAB nTab )
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index f41bff1..41ef617 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -695,17 +695,15 @@ void SlideSorterController::Resize (const Rectangle& rAvailableSpace)
     }
 }
 
-Rectangle  SlideSorterController::Rearrange (bool bForce)
+void  SlideSorterController::Rearrange (bool bForce)
 {
-    Rectangle aNewContentArea (maTotalWindowArea);
-
-    if (aNewContentArea.IsEmpty())
-        return aNewContentArea;
+    if (maTotalWindowArea.IsEmpty())
+        return;
 
     if (mnModelChangeLockCount>0)
     {
         mbIsForcedRearrangePending |= bForce;
-        return aNewContentArea;
+        return;
     }
     else
         mbIsForcedRearrangePending = false;
@@ -717,7 +715,7 @@ Rectangle  SlideSorterController::Rearrange (bool bForce)
             mrView.UpdateOrientation();
 
         // Place the scroll bars.
-        aNewContentArea = GetScrollBarManager().PlaceScrollBars(
+        Rectangle aNewContentArea = GetScrollBarManager().PlaceScrollBars(
             maTotalWindowArea,
             mrView.GetOrientation() != view::Layouter::VERTICAL,
             mrView.GetOrientation() != view::Layouter::HORIZONTAL);
@@ -746,8 +744,6 @@ Rectangle  SlideSorterController::Rearrange (bool bForce)
 
         mrView.RequestRepaint();
     }
-
-    return aNewContentArea;
 }
 
 rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxRequest& rRequest)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 4e1618e..97b9347 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -93,10 +93,8 @@ public:
             window and with it the SlideSorterView is resized event when its
             size does not change (the size does change when the visibility
             of scroll bars changes.)
-        @return
-            Returns the space occupied by the browser window.
     */
-    Rectangle Rearrange (bool bForce = false);
+    void Rearrange (bool bForce = false);
 
     /** Return the descriptor of the page that is rendered under the
         given position.  This takes the IsOnlyPreviewTriggersMouseOver
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ad0797c..033141e5 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -929,13 +929,13 @@ const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() con
     return nullptr;
 }
 
-SfxStyleSheetBase *SfxCommonTemplateDialog_Impl::GetSelectedStyle() const
+void SfxCommonTemplateDialog_Impl::GetSelectedStyle() const
 {
     if (!IsInitialized() || !pStyleSheetPool || !HasSelectedStyle())
-        return nullptr;
+        return;
     const OUString aTemplName( GetSelectedEntry() );
     const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
-    return pStyleSheetPool->Find( aTemplName, pItem->GetFamily() );
+    pStyleSheetPool->Find( aTemplName, pItem->GetFamily() );
 }
 
 /**
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index ab0d4d1..d3b6deb 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -265,7 +265,7 @@ protected:
 
     void SelectStyle( const OUString& rStyle );
     bool HasSelectedStyle() const;
-    SfxStyleSheetBase* GetSelectedStyle() const;
+    void GetSelectedStyle() const;
     void FillTreeBox();
     void Update_Impl();
     void UpdateFamily_Impl();
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index fbe6a32..146a023 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1181,12 +1181,11 @@ void SvImpLBox::PositionScrollBars( Size& rSize, sal_uInt16 nMask )
         aScrBarBox->Hide();
 }
 
-// nResult: Bit0 == VerSBar Bit1 == HorSBar
-sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
+void SvImpLBox::AdjustScrollBars( Size& rSize )
 {
     long nEntryHeight = pView->GetEntryHeight();
     if( !nEntryHeight )
-        return 0;
+        return;
 
     sal_uInt16 nResult = 0;
 
@@ -1303,7 +1302,6 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
         aHorSBar->Hide();
     }
     rSize = aOSize;
-    return nResult;
 }
 
 void SvImpLBox::InitScrollBarBox()
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 835c239..c93cd2f 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -201,7 +201,7 @@ private:
     bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry*,long nY );
 
     void                PositionScrollBars( Size& rOSize, sal_uInt16 nMask );
-    sal_uInt16              AdjustScrollBars( Size& rSize );
+    void                AdjustScrollBars( Size& rSize );
 
     void                BeginScroll();
     void                EndScroll();
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 7cfe29d..c74af2e 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -89,7 +89,7 @@ public:
     virtual ~UnoTreeListBoxImpl();
     virtual void dispose() override;
 
-    sal_uInt32 insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=TREELIST_APPEND );
+    void            insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=TREELIST_APPEND );
 
     virtual void    RequestingChildren( SvTreeListEntry* pParent ) override;
 
@@ -1535,12 +1535,12 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void)
 
 
 
-sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos )
+void UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos )
 {
     if( pParent )
-        return SvTreeListBox::Insert( pEntry, pParent, nPos );
+        SvTreeListBox::Insert( pEntry, pParent, nPos );
     else
-        return SvTreeListBox::Insert( pEntry, nPos );
+        SvTreeListBox::Insert( pEntry, nPos );
 }
 
 
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index c54712a..8b0af90 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -352,9 +352,6 @@ public:
                             SvNumberFormatter* pNFormatr,
                             long nLanguage );
 
-    static sal_Int32 GetRowCount(css::uno::Reference< css::sdbc::XConnection> xConnection,
-                                 const OUString& rTableName);
-
     sal_uLong GetColumnFormat( const OUString& rDBName,
                             const OUString& rTableName,
                             const OUString& rColNm,
@@ -389,8 +386,8 @@ public:
     css::uno::Reference< css::sdbc::XConnection>
                     RegisterConnection(OUString const& rSource);
 
-    const SwDSParam* CreateDSData(const SwDBData& rData)
-                        {return FindDSData(rData, true);}
+    void            CreateDSData(const SwDBData& rData)
+                        { FindDSData(rData, true); }
     const SwDSParams_t& GetDSParamArray() const { return m_DataSourceParams; }
 
     /// close all data sources - after fields were updated
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c752fa3..d6c5c08 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -960,7 +960,7 @@ public:
                                             const SwTOXBase& rTOX,
                                             const SfxItemSet* pSet = nullptr,
                                             bool bExpand = false );
-    const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
+    void              InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
                                             const SwTOXBase& rTOX,
                                             const SfxItemSet* pSet = nullptr );
     static SwTOXBase* GetCurTOX( const SwPosition& rPos );
@@ -1523,7 +1523,7 @@ public:
     // Interface for the list of Ruby - texts/attributes
     static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                         sal_uInt16 nMode );
-    sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
+    void SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
                         sal_uInt16 nMode );
 
     void ReadLayoutCache( SvStream& rStream );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 6a48ab0..d12f617 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -415,7 +415,7 @@ public:
     void    DeleteTOXMark(SwTOXMark* pMark);
 
     /// Get all marks at current SPoint.
-    sal_uInt16  GetCurTOXMarks(SwTOXMarks& rMarks) const ;
+    void    GetCurTOXMarks(SwTOXMarks& rMarks) const ;
 
     /// Insert content table. Renew if required.
     void                InsertTableOf(const SwTOXBase& rTOX,
@@ -926,7 +926,7 @@ public:
     bool IsLabelDoc() const;
 
     /// Interface for TextInputData - (for input of Japanese/Chinese chars.)
-    SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage);
+    void CreateExtTextInput(LanguageType eInputLanguage);
     OUString DeleteExtTextInput( SwExtTextInput* pDel = nullptr, bool bInsText = true);
     void SetExtTextInputData( const CommandExtTextInputData& );
 
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index b2dbe78..5263bac 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -175,7 +175,7 @@ public:
     /// Overlay, because set-field takes care for its being updated by itself.
     inline OUString         GetSetRefName() const;
 
-    sal_uInt16 SetSeqRefNo( SwSetExpField& rField );
+    void   SetSeqRefNo( SwSetExpField& rField );
 
     size_t GetSeqFieldList( SwSeqFieldList& rList );
 
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index e17cab3..3ee1857 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -341,7 +341,7 @@ public:
 
     long BeginDrag( const Point *pPt, bool bProp );
     long Drag     ( const Point *pPt, bool bProp );
-    long EndDrag  ( const Point *pPt, bool bProp );
+    void EndDrag  ( const Point *pPt, bool bProp );
     void BreakDrag();
 
     /// Methods for status line.
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index c603430..c5da396 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -355,7 +355,7 @@ public:
     virtual SwContentFrame *MakeFrame( SwFrame* ) override;
     virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
     virtual SwContentNode *JoinNext() override;
-    virtual SwContentNode *JoinPrev() override;
+    virtual void JoinPrev() override;
 
     SwContentNode *AppendNode( const SwPosition & );
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d1ef736..fbb4b36 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -387,7 +387,7 @@ public:
     virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
 
     virtual SwContentNode *JoinNext();
-    virtual SwContentNode *JoinPrev();
+    virtual void           JoinPrev();
     /** Is it possible to join two nodes?
        In pIdx the second position can be returned. */
     bool CanJoinNext( SwNodeIndex* pIdx =nullptr ) const;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 01d32fb..295aaf5 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -282,7 +282,7 @@ public:
        @param bPointFirst true: If the point is behind the mark then swap.
                           false: If the mark is behind the point then swap.
     */
-    SwPaM & Normalize(bool bPointFirst = true);
+    void Normalize(bool bPointFirst = true);
 
     /// @return the document (SwDoc) at which the PaM is registered
     SwDoc* GetDoc() const   { return m_pPoint->nNode.GetNode().GetDoc(); }
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index cd05f4e..fc7c612 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -313,7 +313,7 @@ public:
     OUString GetLongName( sal_uInt16 ) const;           // Get long name for index.
 
     bool   Delete( sal_uInt16 );
-    sal_uInt16 Rename( sal_uInt16, const OUString*, const OUString* );
+    void   Rename( sal_uInt16, const OUString*, const OUString* );
     sal_uLong  CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort,
                                     const OUString& rLong );
 
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 541df56..13d1e15 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -431,12 +431,12 @@ public:
     virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
 
     // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc.
-    // If not, so create it an copy all other used things. The return is this
-    SwTOXBase& CopyTOXBase( SwDoc*, const SwTOXBase& );
+    // If not, so create it an copy all other used things.
+    void                CopyTOXBase( SwDoc*, const SwTOXBase& );
 
     const SwTOXType*    GetTOXType() const;
 
-    sal_uInt16              GetCreateType() const;      // creation types
+    sal_uInt16          GetCreateType() const;      // creation types
 
     OUString            GetTOXName() const {return m_aName;}
     void                SetTOXName(const OUString& rSet) {m_aName = rSet;}
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index daf1bb1..ea72481 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -58,7 +58,7 @@ public:
     void CheckCondColl();
 
     // For references to footnotes.
-    sal_uInt16 SetSeqRefNo();
+    void SetSeqRefNo();
     void SetSeqNo( sal_uInt16 n )       { m_nSeqNo = n; }   // For Readers.
     sal_uInt16 GetSeqRefNo() const      { return m_nSeqNo; }
 
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index e9dcca0..7081637 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -285,7 +285,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     SAL_DLLPRIVATE long          PhyPageUp();
     SAL_DLLPRIVATE long          PhyPageDown();
 
-    SAL_DLLPRIVATE int           _CreateScrollbar( bool bHori );
+    SAL_DLLPRIVATE void           _CreateScrollbar( bool bHori );
     DECL_DLLPRIVATE_LINK_TYPED(  ScrollHdl, ScrollBar*, void );
     DECL_DLLPRIVATE_LINK_TYPED(  EndScrollHdl, ScrollBar*, void );
     SAL_DLLPRIVATE bool          UpdateScrollbars();
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 7069de1..afdd060 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -370,7 +370,7 @@ public:
                          vcl::RenderContext& rRenderContext, const Rectangle& rRect );
 
     // Fill temporary doc with selected text for Print or PDF export.
-    SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt );
+    void FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt );
 
     // Called internally for Shell. Formats pages.
     void CalcPagesForPrint( sal_uInt16 nMax );
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 65b347c..ef74593 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -529,7 +529,7 @@ SwPaM* SwPaM::MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg )
     return pPam;
 }
 
-SwPaM & SwPaM::Normalize(bool bPointFirst)
+void SwPaM::Normalize(bool bPointFirst)
 {
     if (HasMark())
         if ( ( bPointFirst && *m_pPoint > *m_pMark) ||
@@ -537,7 +537,6 @@ SwPaM & SwPaM::Normalize(bool bPointFirst)
         {
             Exchange();
         }
-    return *this;
 }
 
 /// return page number at cursor (for reader and page bound frames)
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 0bb6e4a..d90cfd6 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -90,7 +90,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
     return rList.size();
 }
 
-sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
+void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
                             sal_uInt16 nMode )
 {
     GetIDocumentUndoRedo().StartUndo( UNDO_SETRUBYATTR, nullptr );
@@ -175,8 +175,6 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
         (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor );
 
     GetIDocumentUndoRedo().EndUndo( UNDO_SETRUBYATTR, nullptr );
-
-    return nListEntry;
 }
 
 bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index afc95d7..98859a8 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -370,18 +370,18 @@ SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
     return pNewSection;
 }
 
-const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
+void SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
                                                 const SwTOXBase& rTOX,
                                                 const SfxItemSet* pSet )
 {
-    // check for recursiv TOX
+    // check for recursive TOX
     SwNode* pNd = GetNodes()[ nSttNd ];
     SwSectionNode* pSectNd = pNd->FindSectionNode();
     while( pSectNd )
     {
         SectionType eT = pSectNd->GetSection().GetType();
         if( TOX_HEADER_SECTION == eT || TOX_CONTENT_SECTION == eT )
-            return nullptr;
+            return;
         pSectNd = pSectNd->StartOfSectionNode()->FindSectionNode();
     }
 
@@ -399,14 +399,13 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd
     if (!pNewSectionNode)
     {
         DelSectionFormat( pFormat );
-        return nullptr;
+        return;
     }
 
     SwTOXBaseSection *const pNewSection(
         dynamic_cast<SwTOXBaseSection*>(& pNewSectionNode->GetSection()));
     if (pNewSection)
         pNewSection->SetTOXName(sSectNm); // rTOX may have had no name...
-    return pNewSection;
 }
 
 /// Get current table of contents
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 6b34857..544ee12 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1385,9 +1385,8 @@ SwContentNode *SwContentNode::JoinNext()
     return this;
 }
 
-SwContentNode *SwContentNode::JoinPrev()
+void SwContentNode::JoinPrev()
 {
-    return this;
 }
 
 /// Get info from Modify
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 3336422..1c8e0d6 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -934,12 +934,11 @@ void SwEditShell::SetLinkUpdMode( sal_uInt16 nMode )
 }
 
 // Interface for TextInputData - (for text input of japanese/chinese characters)
-SwExtTextInput* SwEditShell::CreateExtTextInput(LanguageType eInputLanguage)
+void SwEditShell::CreateExtTextInput(LanguageType eInputLanguage)
 {
     SwExtTextInput* pRet = GetDoc()->CreateExtTextInput( *GetCursor() );
     pRet->SetLanguage(eInputLanguage);
     pRet->SetOverwriteCursor( SwCursorShell::IsOverwriteCursor() );
-    return pRet;
 }
 
 OUString SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, bool bInsText )
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 3935c67..36af137 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -90,9 +90,9 @@ void SwEditShell::DeleteTOXMark( SwTOXMark* pMark )
 }
 
 /// Collect all listing markers
-sal_uInt16 SwEditShell::GetCurTOXMarks(SwTOXMarks& rMarks) const
+void SwEditShell::GetCurTOXMarks(SwTOXMarks& rMarks) const
 {
-    return SwDoc::GetCurTOXMark( *GetCursor()->Start(), rMarks );
+    SwDoc::GetCurTOXMark( *GetCursor()->Start(), rMarks );
 }
 
 bool SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase)
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 973ad93..2718e4a 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -532,10 +532,10 @@ sal_uLong SwSetExpFieldType::GetSeqFormat()
     return pField->GetFormat();
 }
 
-sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
+void SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
 {
     if( !HasWriterListeners() || !(nsSwGetSetExpType::GSE_SEQ & nType) )
-        return USHRT_MAX;
+        return;
 
     std::vector<sal_uInt16> aArr;
 
@@ -563,7 +563,7 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
                 break;
 
         if( n == aArr.size() || aArr[ n ] > nNum )
-            return nNum;            // no -> use it
+            return;            // no -> use it
     }
 
     // flagged all numbers, so determine the right number
@@ -578,7 +578,6 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rField )
     }
 
     rField.SetSeqNumber( n );
-    return n;
 }
 
 size_t SwSetExpFieldType::GetSeqFieldList( SwSeqFieldList& rList )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 20e373a..8de3667 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -684,7 +684,7 @@ long SwFEShell::Drag( const Point *pPt, bool )
     return 0;
 }
 
-long SwFEShell::EndDrag( const Point *, bool )
+void SwFEShell::EndDrag( const Point *, bool )
 {
     OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" );
     SdrView *pView = Imp()->GetDrawView();
@@ -721,10 +721,7 @@ long SwFEShell::EndDrag( const Point *, bool )
 
         GetDoc()->getIDocumentState().SetModified();
         ::FrameNotify( this );
-
-        return 1;
     }
-    return 0;
 }
 
 void SwFEShell::BreakDrag()
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index 53509ab..6c1d368 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -57,7 +57,7 @@ public:
 
     virtual ~SwXMLTextBlockExport() {}
     sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum /*eClass*/) override {return 0;}
-    sal_uInt32 exportDoc(const OUString & rText);
+    void exportDoc(const OUString & rText);
     void _ExportAutoStyles() override {}
     void _ExportMasterStyles () override {}
     void _ExportContent() override {}
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 8c984de..60ac54e 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -401,10 +401,10 @@ public:
 
     void             Current( const SdrObject *pNew ) { m_pCurrent = pNew; }
     const SdrObject *operator()() const { return m_pCurrent; }
-    const SdrObject *Top();
+    void             Top();
     const SdrObject *Bottom();
     const SdrObject *Next();
-    const SdrObject *Prev();
+    void             Prev();
 };
 
 class StackHack
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index d6f4675..2cc44b2 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -298,12 +298,11 @@ public:
     }
 
 /** retrieves kashida opportunities for a given text range.
-   returns the number of kashida positions in the given text range
 
    pKashidaPositions: buffer to receive the char indices of the
                       kashida opportunties relative to the paragraph
 */
-    sal_Int32 GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
+    void GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
        sal_Int32* pKashidaPosition);
 
 /** Use regular blank justification instead of kashdida justification for the given line of text.
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index d662ac8..09e1b38 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -307,7 +307,7 @@ public:
                             bool& bRight, bool bInsertCursor );
 
     /// Methods to manage the FollowFrame
-    SwContentFrame *SplitFrame( const sal_Int32 nTextPos );
+    void            SplitFrame( const sal_Int32 nTextPos );
     SwContentFrame *JoinFrame();
     inline sal_Int32  GetOfst() const { return mnOffset; }
            void        _SetOfst( const sal_Int32 nNewOfst );
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 6f8d05c..100efd7 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2232,7 +2232,7 @@ SwOrderIter::SwOrderIter( const SwPageFrame *pPg, bool bFlys ) :
 {
 }
 
-const SdrObject *SwOrderIter::Top()
+void SwOrderIter::Top()
 {
     m_pCurrent = nullptr;
     if ( m_pPage->GetSortedObjs() )
@@ -2256,7 +2256,6 @@ const SdrObject *SwOrderIter::Top()
             }
         }
     }
-    return m_pCurrent;
 }
 
 const SdrObject *SwOrderIter::Bottom()
@@ -2314,7 +2313,7 @@ const SdrObject *SwOrderIter::Next()
     return m_pCurrent;
 }
 
-const SdrObject *SwOrderIter::Prev()
+void SwOrderIter::Prev()
 {
     const sal_uInt32 nCurOrd = m_pCurrent ? m_pCurrent->GetOrdNumDirect() : 0;
     m_pCurrent = nullptr;
@@ -2339,7 +2338,6 @@ const SdrObject *SwOrderIter::Prev()
             }
         }
     }
-    return m_pCurrent;
 }
 
 /// Keep and restore the substructure of a layout frame for an action.
diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx
index b2ee9e0..4ba7d8b 100644
--- a/sw/source/core/swg/SwXMLBlockExport.cxx
+++ b/sw/source/core/swg/SwXMLBlockExport.cxx
@@ -95,7 +95,7 @@ SwXMLTextBlockExport::SwXMLTextBlockExport(
                             XML_NAMESPACE_TEXT );
 }
 
-sal_uInt32 SwXMLTextBlockExport::exportDoc(const OUString &rText)
+void SwXMLTextBlockExport::exportDoc(const OUString &rText)
 {
     GetDocHandler()->startDocument();
 
@@ -130,7 +130,6 @@ sal_uInt32 SwXMLTextBlockExport::exportDoc(const OUString &rText)
         }
     }
     GetDocHandler()->endDocument();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 279b2f4..316b308 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -329,7 +329,7 @@ bool SwTextBlocks::Delete( sal_uInt16 n )
     return false;
 }
 
-sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l )
+void SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString* l )
 {
     sal_uInt16 nIdx = USHRT_MAX;
     if( pImp && !pImp->bInPutMuchBlocks )
@@ -345,7 +345,7 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
         {
             OSL_ENSURE( false, "No short name provided in the rename" );
             nErr = ERR_SWG_INTERNAL_ERROR;
-            return USHRT_MAX;
+            return;
         }
 
         if( pImp->IsFileChanged() )
@@ -369,7 +369,6 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const OUString* s, const OUString
         if( !nErr )
             nIdx = pImp->GetIndex( aNew );
     }
-    return nIdx;
 }
 
 sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort,
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 3f1fb82..7ba5c35 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -663,7 +663,7 @@ SwContentFrame *SwTextFrame::JoinFrame()
     return pNxt;
 }
 
-SwContentFrame *SwTextFrame::SplitFrame( const sal_Int32 nTextPos )
+void SwTextFrame::SplitFrame( const sal_Int32 nTextPos )
 {
     SwSwapIfSwapped swap( this );
 
@@ -737,8 +737,6 @@ SwContentFrame *SwTextFrame::SplitFrame( const sal_Int32 nTextPos )
     // No SetOfst or CalcFollow, because an AdjustFollow follows immediately anyways
 
     pNew->ManipOfst( nTextPos );
-
-    return pNew;
 }
 
 void SwTextFrame::_SetOfst( const sal_Int32 nNewOfst )
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 479114c..c36f3860 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -290,13 +290,12 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const SwLineLayout& rLine,
     return nOfst;
 }
 
-const SwLineLayout *SwTextIter::TwipsToLine( const SwTwips y)
+void SwTextIter::TwipsToLine( const SwTwips y)
 {
     while( m_nY + GetLineHeight() <= y && Next() )
         ;
     while( m_nY > y && Prev() )
         ;
-    return m_pCurr;
 }
 
 // Local helper function to check, if pCurr needs a field rest portion:
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 42e9018..dce06ef 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -109,7 +109,7 @@ public:
     const SwLineLayout *GetPrevLine();
 
     void CharToLine( const sal_Int32 );
-    const SwLineLayout *TwipsToLine(const SwTwips);
+    void TwipsToLine(const SwTwips);
 
     // Truncates all after pCurr
     void TruncLines( bool bNoteFollow = false );
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 06a30aa..362bbaf 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1815,7 +1815,7 @@ void SwScriptInfo::MarkKashidaInvalid(sal_Int32 nKashPos)
 }
 
 // retrieve the kashida positions in the given text range
-sal_Int32 SwScriptInfo::GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
+void SwScriptInfo::GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
     sal_Int32* pKashidaPosition)
 {
     size_t nCntKash = 0;
@@ -1836,7 +1836,6 @@ sal_Int32 SwScriptInfo::GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
         pKashidaPosition [ nCntKashEnd - nCntKash ] = GetKashida ( nCntKashEnd );
         nCntKashEnd++;
     }
-    return nCntKashEnd - nCntKash;
 }
 
 void SwScriptInfo::SetNoKashidaLine(sal_Int32 nStt, sal_Int32 nLen)
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 68066b7..1acfb02 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -455,7 +455,7 @@ void SwTOXBase::RegisterToTOXType( SwTOXType& rType )
     rType.Add( this );
 }
 
-SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
+void SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
 {
     maMSTOCExpression = rSource.maMSTOCExpression;
     SwTOXType* pType = const_cast<SwTOXType*>(rSource.GetTOXType());
@@ -507,8 +507,6 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
         m_aName = rSource.GetTOXName();
     else
         m_aName = pDoc->GetUniqueTOXBaseName( *pType, rSource.GetTOXName() );
-
-    return *this;
 }
 
 // TOX specific functions
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index 3bbf872..455ac72 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -497,23 +497,23 @@ void SwTextFootnote::DelFrames( const SwFrame* pSib )
 
 /// Set the sequence number for the current footnote.
 /// @returns The new sequence number or USHRT_MAX if invalid.
-sal_uInt16 SwTextFootnote::SetSeqRefNo()
+void SwTextFootnote::SetSeqRefNo()
 {
     if( !m_pTextNode )
-        return USHRT_MAX;
+        return;
 
     SwDoc* pDoc = m_pTextNode->GetDoc();
     if( pDoc->IsInReading() )
-        return USHRT_MAX;
+        return;
 
     std::set<sal_uInt16> aUsedNums;
     std::vector<SwTextFootnote*> badRefNums;
     ::lcl_FillUsedFootnoteRefNumbers(*pDoc, this, aUsedNums, badRefNums);
     if ( ::lcl_IsRefNumAvailable(aUsedNums, m_nSeqNo) )
-        return m_nSeqNo;
+        return;
     std::vector<sal_uInt16> unused;
     ::lcl_FillUnusedSeqRefNums(unused, aUsedNums, 1);
-    return m_nSeqNo = unused[0];
+    m_nSeqNo = unused[0];
 }
 
 /// Set a unique sequential reference number for every footnote in the document.
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 85a8366..6cb302d 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -725,7 +725,7 @@ SwContentNode *SwTextNode::JoinNext()
     return this;
 }
 
-SwContentNode *SwTextNode::JoinPrev()
+void SwTextNode::JoinPrev()
 {
     SwNodes& rNds = GetNodes();
     SwNodeIndex aIdx( *this );
@@ -815,8 +815,6 @@ SwContentNode *SwTextNode::JoinPrev()
     else {
         OSL_FAIL( "kein TextNode." );
     }
-
-    return this;
 }
 
 // erzeugt einen AttrSet mit Bereichen fuer Frame-/Para/Char-Attributen
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 9945b48..1318dc4 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -322,7 +322,7 @@ void SwViewShell::CalcPagesForPrint( sal_uInt16 nMax )
     pMyLayout->EndAllAction();
 }
 
-SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
+void SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
 {
     OSL_ENSURE( dynamic_cast<const SwFEShell*>( this) !=  nullptr,"SwViewShell::Prt for FEShell only");
     SwFEShell* pFESh = static_cast<SwFEShell*>(this);
@@ -422,7 +422,6 @@ SwDoc * SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
             }
         }
     }
-    return pPrtDoc;
 }
 
 // TODO: there is already a GetPageByPageNum, but it checks some physical page
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 19bb42d..b09fcfd 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -206,7 +206,7 @@ public:
     }
 
     const uno::Reference< XMultiServiceFactory >& GetServiceFactory();
-    const uno::Reference< drawing::XDrawPage >& GetDrawPage();
+    void GetDrawPage();
     const uno::Reference< drawing::XShapes >& GetShapes();
     const uno::Reference< script::XEventAttacherManager >& GetControlEventManager();
     const uno::Reference< script::XEventAttacherManager >& GetFormEventManager();
@@ -276,7 +276,7 @@ const uno::Reference< XMultiServiceFactory >& SwHTMLForm_Impl::GetServiceFactory
     return xServiceFactory;
 }
 
-const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
+void SwHTMLForm_Impl::GetDrawPage()
 {
     if( !xDrawPage.is() && pDocSh )
     {
@@ -287,7 +287,6 @@ const uno::Reference< drawing::XDrawPage >& SwHTMLForm_Impl::GetDrawPage()
         xDrawPage = xTextDoc->getDrawPage();
         OSL_ENSURE( xDrawPage.is(), "drawing::XDrawPage nicht erhalten" );
     }
-    return xDrawPage;
 }
 
 const uno::Reference< container::XIndexContainer >& SwHTMLForm_Impl::GetForms()
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index 6ef008b..944a9e2 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -71,8 +71,8 @@ public:
 
     void SetDepth( sal_uInt16 nDepth ) { nDeep = nDepth; }
     sal_uInt16 GetDepth() const { return nDeep; }
-    sal_uInt16 IncDepth() { return ++nDeep; }
-    sal_uInt16 DecDepth() { return nDeep==0 ? 0 : --nDeep; }
+    void IncDepth() { ++nDeep; }
+    void DecDepth() { if (nDeep!=0) --nDeep; }
     inline sal_uInt8 GetLevel() const;
 
     bool IsRestart() const { return bRestart; }
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index b4632ba..f3f1b6c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -757,20 +757,6 @@ void SwDBManager::GetColumnNames(ListBox* pListBox,
 }
 
 
-sal_Int32 SwDBManager::GetRowCount(uno::Reference<sdbc::XConnection> xConnection,
-                             const OUString& rTableName)
-{
-    uno::Reference<beans::XPropertySet> xRow = GetRowSupplier(xConnection, rTableName, SwDBSelect::UNKNOWN);
-    sal_Int32 nCnt = 0;
-
-    if(xRow.is())
-        xRow->getPropertyValue( "RowCount" ) >>= nCnt;
-
-    return nCnt;
-}
-
-
-
 SwDBManager::SwDBManager(SwDoc* pDoc)
     : bCancel(false)
     , bInitDBFields(false)
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 600ab97..271fb33 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -280,7 +280,7 @@ IMPL_LINK_TYPED( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void
     }
 }
 
-int SwView::_CreateScrollbar( bool bHori )
+void SwView::_CreateScrollbar( bool bHori )
 {
     vcl::Window *pMDI = &GetViewFrame()->GetWindow();
     VclPtr<SwScrollbar>& ppScrollbar = bHori ? m_pHScrollbar : m_pVScrollbar;
@@ -302,8 +302,6 @@ int SwView::_CreateScrollbar( bool bHori )
 
     if (!m_bShowAtResize)
         ppScrollbar->ExtendedShow();
-
-    return 1;
 }
 
 IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void )
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 9e21fbe..ce784a0 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -277,17 +277,15 @@ OUString Application::GetAppFileName()
     return aAppFileName;
 }
 
-sal_uInt16 Application::Exception( sal_uInt16 nError )
+void Application::Exception( sal_uInt16 nError )
 {
     switch ( nError & EXC_MAJORTYPE )
     {
         // System has precedence (so do nothing)
         case EXC_SYSTEM:
-            return 0;
-
         case EXC_DISPLAY:
         case EXC_REMOTE:
-            return 0;
+            break;
 
 #ifdef DBG_UTIL
         case EXC_RSCNOTLOADED:
@@ -302,8 +300,6 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
             break;
 #endif
     }
-
-    return 0;
 }
 
 void Application::Abort( const OUString& rErrorText )
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 1490414..5996d14 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -590,28 +590,26 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction )
     }
 }
 
-long Slider::ImplDoSlide( long nNewPos )
+void Slider::ImplDoSlide( long nNewPos )
 {
     if ( meScrollType != SCROLL_DONTKNOW )
-        return 0;
+        return;
 
     meScrollType = SCROLL_DRAG;
-    long nDelta = ImplSlide( nNewPos, true );
+    ImplSlide( nNewPos, true );
     meScrollType = SCROLL_DONTKNOW;
-    return nDelta;
 }
 
-long Slider::ImplDoSlideAction( ScrollType eScrollType )
+void Slider::ImplDoSlideAction( ScrollType eScrollType )
 {
     if ( (meScrollType != SCROLL_DONTKNOW) ||
          (eScrollType == SCROLL_DONTKNOW) ||
          (eScrollType == SCROLL_DRAG) )
-        return 0;
+        return;
 
     meScrollType = eScrollType;
-    long nDelta = ImplDoAction( true );
+    ImplDoAction( true );
     meScrollType = SCROLL_DONTKNOW;
-    return nDelta;
 }
 
 void Slider::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 6a22e4a..fed08e4 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -42,9 +42,9 @@ OutputDevice* PDFWriter::GetReferenceDevice()
     return xImplementation->getReferenceDevice();
 }
 
-sal_Int32 PDFWriter::NewPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, Orientation eOrientation )
+void PDFWriter::NewPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, Orientation eOrientation )
 {
-    return xImplementation->newPage( nPageWidth, nPageHeight, eOrientation );
+    xImplementation->newPage( nPageWidth, nPageHeight, eOrientation );
 }
 
 bool PDFWriter::Emit()
@@ -347,14 +347,14 @@ sal_Int32 PDFWriter::CreateDest( const Rectangle& rRect, sal_Int32 nPageNr, PDFW
     return xImplementation->createDest( rRect, nPageNr, eType );
 }
 
-sal_Int32 PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
+void PDFWriter::SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
 {
-    return xImplementation->setLinkDest( nLinkId, nDestId );
+    xImplementation->setLinkDest( nLinkId, nDestId );
 }
 
-sal_Int32 PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL )
+void PDFWriter::SetLinkURL( sal_Int32 nLinkId, const OUString& rURL )
 {
-    return xImplementation->setLinkURL( nLinkId, rURL );
+    xImplementation->setLinkURL( nLinkId, rURL );
 }
 
 void PDFWriter::SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyId )
@@ -367,19 +367,19 @@ sal_Int32 PDFWriter::CreateOutlineItem( sal_Int32 nParent, const OUString& rText
     return xImplementation->createOutlineItem( nParent, rText, nDestID );
 }
 
-sal_Int32 PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent )
+void PDFWriter::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent )
 {
-    return xImplementation->setOutlineItemParent( nItem, nNewParent );
+    xImplementation->setOutlineItemParent( nItem, nNewParent );
 }
 
-sal_Int32 PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText )
+void PDFWriter::SetOutlineItemText( sal_Int32 nItem, const OUString& rText )
 {
-    return  xImplementation->setOutlineItemText( nItem, rText );
+    xImplementation->setOutlineItemText( nItem, rText );
 }
 
-sal_Int32 PDFWriter::SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDest )
+void PDFWriter::SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDest )
 {
-    return xImplementation->setOutlineItemDest( nItem, nDest );
+    xImplementation->setOutlineItemDest( nItem, nDest );
 }
 
 void PDFWriter::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr )
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 58777ac..a1f074a 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -59,7 +59,7 @@ class GrindApp : public Application
 {
 public:
     virtual int Main() override;
-    virtual sal_uInt16 Exception( sal_uInt16 nError ) override;
+    virtual void Exception( sal_uInt16 nError ) override;
 };
 
 class TestWindow : public Dialog
@@ -830,7 +830,7 @@ void TestWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
     fflush(stdout);
 }
 
-sal_uInt16 GrindApp::Exception( sal_uInt16 nError )
+void GrindApp::Exception( sal_uInt16 nError )
 {
     switch( nError & EXC_MAJORTYPE )
     {
@@ -838,7 +838,6 @@ sal_uInt16 GrindApp::Exception( sal_uInt16 nError )
             Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
             break;
     }
-    return 0;
 }
 
 int GrindApp::Main()


More information about the Libreoffice-commits mailing list