loplugin:casttovoid: sw

Change-Id: I224e9995962901e8740bfaed06d57f7c0389236c

46 files changed, 16 insertions, 190 deletions

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 6848f479c35b..8493de67b9eb 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -252,9 +252,6 @@ public:
         const SwFEShell *pFESh,
         SwAccessibleObjShape_Impl  **pSelShape ) const;
 
-#if OSL_DEBUG_LEVEL > 0
-    iterator begin() { return maMap.begin(); }
-#endif
     iterator end() { return maMap.end(); }
     const_iterator cbegin() const { return maMap.cbegin(); }
     const_iterator cend() const { return maMap.cend(); }
@@ -1690,42 +1687,10 @@ SwAccessibleMap::~SwAccessibleMap()
 #endif
     {
         osl::MutexGuard aGuard( maMutex );
-#if OSL_DEBUG_LEVEL > 0
-        if( mpFrameMap )
-        {
-            SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
-            while( aIter != mpFrameMap->end() )
-            {
-                uno::Reference < XAccessible > xTmp = (*aIter).second;
-                if( xTmp.is() )
-                {
-                    SwAccessibleContext *pTmp =
-                        static_cast< SwAccessibleContext * >( xTmp.get() );
-                    (void) pTmp;
-                }
-                ++aIter;
-            }
-        }
-        if( mpShapeMap )
-        {
-            SwAccessibleShapeMap_Impl::iterator aIter = mpShapeMap->begin();
-            while( aIter != mpShapeMap->end() )
-            {
-                uno::Reference < XAccessible > xTmp = (*aIter).second;
-                if( xTmp.is() )
-                {
-                    ::accessibility::AccessibleShape *pTmp =
-                        static_cast< ::accessibility::AccessibleShape* >( xTmp.get() );
-                    (void) pTmp;
-                }
-                ++aIter;
-            }
-        }
         assert((!mpFrameMap || mpFrameMap->empty()) &&
                 "Frame map should be empty after disposing the root frame");
         assert((!mpShapeMap || mpShapeMap->empty()) &&
                 "Object map should be empty after disposing the root frame");
-#endif
         delete mpFrameMap;
         mpFrameMap = nullptr;
         delete mpShapeMap;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a109b502c48e..05b1d54010b1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1549,7 +1549,6 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
                     bool const bResult =
                         pTableFrame->GetCharRect(m_aCharRect, *m_pTableCursor->GetPoint());
                     OSL_ENSURE( bResult, "GetCharRect failed." );
-                    (void) bResult; // non-debug: unused
                 }
             }
 
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 7605a05e9325..d4f117ebc66b 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1704,10 +1704,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
     return ( nullptr != pNewRedl ) || bMerged;
 }
 
-bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl, bool bCallDelete )
+bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl, bool )
 {
-    (void)bCallDelete;
-
     // #TODO - equivalent for 'SwTableRowRedline'
     /*
     CHECK_REDLINE( this )
@@ -1748,10 +1746,8 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl,
     return nullptr != pNewRedl;
 }
 
-bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRedl, bool bCallDelete )
+bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRedl, bool )
 {
-    (void)bCallDelete;
-
     // #TODO - equivalent for 'SwTableCellRedline'
     /*
     CHECK_REDLINE( this )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 9a13a5799a99..7ea1692dd559 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -304,9 +304,10 @@ namespace
                 typeid(*pMark).name() << " " <<
                 pMark->GetName());
         }
+#else
+        (void) rMarks;
 #endif
         assert(std::is_sorted(rMarks.begin(), rMarks.end(), lcl_MarkOrderingByStart));
-        (void) rMarks;
     };
 }
 
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index f3e97f26095b..00eb8b0466f6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -192,7 +192,6 @@ void SetGetExpField::SetBodyPos( const SwContentFrame& rFrame )
         SwPosition aPos( aIdx );
         bool const bResult = ::GetBodyTextNode( rDoc, aPos, rFrame );
         OSL_ENSURE(bResult, "Where is the field?");
-        (void) bResult; // unused in non-debug
         nNode = aPos.nNode.GetIndex();
         nContent = aPos.nContent.GetIndex();
     }
@@ -1020,7 +1019,6 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, SwFieldIds nFiel
         SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
         bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame );
         OSL_ENSURE(bResult, "where is the Field");
-        (void) bResult; // unused in non-debug
         pNew = new SetGetExpField( aPos.nNode, &rTField, &aPos.nContent );
     }
 
@@ -1067,7 +1065,6 @@ void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd )
 
             bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame );
             OSL_ENSURE(bResult, "where is the Field");
-            (void) bResult; // unused in non-debug
             pNew = new SetGetExpField( rSectNd, &aPos );
 
         } while( false );
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index e4e9bcde3719..415e3ce10752 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1366,9 +1366,8 @@ namespace numfunc
         }
     }
 
-    void SwNumberingUIBehaviorConfig::Notify( const css::uno::Sequence<OUString>& aPropertyNames )
+    void SwNumberingUIBehaviorConfig::Notify( const css::uno::Sequence<OUString>& )
     {
-        (void) aPropertyNames;
         SetToDefault();
         LoadConfig();
     }
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1996f0cec10b..0657f0962138 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1661,7 +1661,6 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
     {
         const bool bSuccess = GoPrevious( &pStt->nNode );
         OSL_ENSURE( bSuccess, "Move() - no ContentNode here" );
-        (void) bSuccess;
     }
     pStt->nContent.Assign( pStt->nNode.GetNode().GetContentNode(),
                             pStt->nContent.GetIndex() );
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2f9fde22e263..2c235a30628b 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -279,8 +279,6 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
                     == rCmp.GetContentNode(), "Point in wrong Node" );
         OSL_ENSURE( rCmp.GetMark()->nContent.GetIdxReg()
                     == rCmp.GetContentNode(false), "Mark in wrong Node" );
-        bool bTst = *rCmp.GetPoint() == *rCmp.GetMark();
-        (void) bTst;
     }
 }
 #endif
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 9e572fb73385..e5442a77deaa 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -161,7 +161,6 @@ void SwEditShell::Insert2(SwField& rField, const bool bForceExpandHints)
     {
         const bool bSuccess(GetDoc()->getIDocumentContentOperations().InsertPoolItem(rPaM, aField, nInsertFlags));
         OSL_ENSURE( bSuccess, "Doc->Insert(Field) failed");
-        (void) bSuccess;
     }
 
     EndAllAction();
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index c01a28fcfde6..3aef528a2fe8 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -72,7 +72,6 @@ void SwEditShell::Insert( sal_Unicode c, bool bOnlyCurrCursor )
     {
         const bool bSuccess = GetDoc()->getIDocumentContentOperations().InsertString(rPaM, OUString(c));
         OSL_ENSURE( bSuccess, "Doc->Insert() failed." );
-        (void) bSuccess;
 
         SaveTableBoxContent( rPaM.GetPoint() );
         if( bOnlyCurrCursor )
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 274984d874f8..692fb7ee723d 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2117,7 +2117,6 @@ bool SwRefPageGetFieldType::MakeSetList( SetGetExpFields& rTmpLst )
                     SwPosition aPos( pDoc->GetNodes().GetEndOfPostIts() );
                     bool const bResult = GetBodyTextNode( *pDoc, aPos, *pFrame );
                     OSL_ENSURE(bResult, "where is the Field?");
-                    (void) bResult; // unused in non-debug
                     pNew = new SetGetExpField( aPos.nNode, pTField,
                                                 &aPos.nContent );
                 }
diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx
index c2a548179238..0bb75aa65845 100644
--- a/sw/source/core/frmedt/feflyole.cxx
+++ b/sw/source/core/frmedt/feflyole.cxx
@@ -76,7 +76,6 @@ SwFlyFrame *SwFEShell::FindFlyFrame( const uno::Reference < embed::XEmbeddedObje
         }
 
         OSL_ENSURE( bExist, "OLE-Object unknown and FlyFrame not found." );
-        (void)bExist;
     }
     return pFly;
 }
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index d9770da00662..abec9e53fe0f 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -64,11 +64,6 @@ class SwFootnoteFrame: public SwLayoutFrame
     bool bBackMoveLocked : 1;
     // #i49383# - control unlock of position of lower anchored objects.
     bool mbUnlockPosOfLowerObjs : 1;
-#ifdef DBG_UTIL
-protected:
-    virtual SwTwips ShrinkFrame( SwTwips, bool bTst = false, bool bInfo = false ) override;
-    virtual SwTwips GrowFrame  ( SwTwips, bool bTst = false, bool bInfo = false ) override;
-#endif
 
 public:
     SwFootnoteFrame( SwFrameFormat*, SwFrame*, SwContentFrame*, SwTextFootnote* );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a52c48148c58..c4e7897ad1f3 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -668,14 +668,12 @@ void SwFormatPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
                 bool const bResult =
                     static_cast<SwFormat*>(pDefinedIn)->ResetFormatAttr(RES_PAGEDESC);
                 OSL_ENSURE( bResult, "FormatPageDesc not deleted" );
-                (void) bResult; // unused in non-debug
             }
             else if( typeid(SwContentNode) == typeid( pDefinedIn ))
             {
                 bool const bResult = static_cast<SwContentNode*>(pDefinedIn)
                         ->ResetAttr(RES_PAGEDESC);
                 OSL_ENSURE( bResult, "FormatPageDesc not deleted" );
-                (void) bResult; // unused in non-debug
             }
             break;
 
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 17dbc5086bac..8c370891378a 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -589,7 +589,6 @@ void SwPageFrame::AppendFlyToPage( SwFlyFrame *pNew )
 
         const bool bSuccessInserted = m_pSortedObjs->Insert( *pNew );
         OSL_ENSURE( bSuccessInserted, "Fly not inserted in Sorted." );
-        (void) bSuccessInserted;
 
         // #i87493#
         OSL_ENSURE( pNew->GetPageFrame() == nullptr || pNew->GetPageFrame() == this,
@@ -738,7 +737,6 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, SwPageFrame *pDest )
 
     const bool bSuccessInserted = pDest->GetSortedObjs()->Insert( *pToMove );
     OSL_ENSURE( bSuccessInserted, "Fly not inserted in Sorted." );
-    (void) bSuccessInserted;
 
     // #i28701# - use new method <SetPageFrame(..)>
     pToMove->SetPageFrame( pDest );
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 1fe27ac3cf6e..ab0091f2efcd 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -968,7 +968,6 @@ SwContentNotify::~SwContentNotify()
 void AppendObjs( const SwFrameFormats *pTable, sal_uLong nIndex,
                         SwFrame *pFrame, SwPageFrame *pPage, SwDoc* doc )
 {
-    (void) pTable;
 #if OSL_DEBUG_LEVEL > 0
     std::list<SwFrameFormat*> checkFormats;
     for ( size_t i = 0; i < pTable->size(); ++i )
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index e14b50289733..09e6e197f07c 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -453,36 +453,6 @@ void SwFootnoteFrame::InvalidateNxtFootnoteCnts( SwPageFrame *pPage )
     }
 }
 
-#ifdef DBG_UTIL
-SwTwips SwFootnoteFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
-{
-    static sal_uInt16 nNum = USHRT_MAX;
-    SwTextFootnote* pTextFootnote = GetAttr();
-    if ( pTextFootnote->GetFootnote().GetNumber() == nNum )
-    {
-        int bla = 5;
-        (void)bla;
-
-    }
-    return SwLayoutFrame::GrowFrame( nDist, bTst, bInfo );
-}
-
-SwTwips SwFootnoteFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
-{
-    static sal_uInt16 nNum = USHRT_MAX;
-    if( nNum != USHRT_MAX )
-    {
-        SwTextFootnote* pTextFootnote = GetAttr();
-        if( pTextFootnote->GetFootnote().GetNumber() == nNum )
-        {
-            int bla = 5;
-            (void)bla;
-        }
-    }
-    return SwLayoutFrame::ShrinkFrame( nDist, bTst, bInfo );
-}
-#endif
-
 void SwFootnoteFrame::Cut()
 {
     if ( GetNext() )
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 047e48322134..72b878876c94 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -59,7 +59,6 @@ SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj )
             dynamic_cast<const SwDrawVirtObj*>( &mrDrawObj) !=  nullptr    || // 'virtual' drawing object
             ( dynamic_cast<const SdrVirtObj*>( &mrDrawObj) ==  nullptr &&    // 'master' drawing object
               dynamic_cast<const SwFlyDrawObj*>( &mrDrawObj) ==  nullptr );  // - indirectly checked
-    (void) bObjOfExceptedType;
     OSL_ENSURE( bObjOfExceptedType,
             "SwAnchoredObjectPosition(..) - object of unexpected type!" );
 #endif
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index e2b7500c16eb..bf26e0d4900b 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -389,7 +389,6 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
     if ( nRestoreCurrentTag != -1 )
     {
         const bool bSuccess = mpPDFExtOutDevData->SetCurrentStructureElement( nRestoreCurrentTag );
-        (void)bSuccess;
         OSL_ENSURE( bSuccess, "Failed to restore reopened tag" );
 
 #if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index c653e16334dd..588bf06dd58c 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -457,7 +457,6 @@ bool SwTextFrame::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
 
 void SwHiddenTextPortion::Paint( const SwTextPaintInfo & rInf) const
 {
-    (void)rInf;
 #ifdef DBG_UTIL
     OutputDevice* pOut = const_cast<OutputDevice*>(rInf.GetOut());
     Color aCol( SwViewOption::GetFieldShadingsColor() );
@@ -469,6 +468,8 @@ void SwHiddenTextPortion::Paint( const SwTextPaintInfo & rInf) const
     SwRect aRect( aPos, Size( 100, 200 ) );
     pOut->DrawRect( aRect.SVRect() );
     pOut->SetFillColor( aOldColor );
+#else
+    (void)rInf;
 #endif
 }
 
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 6da8afc1f209..3d0964cda92d 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -578,7 +578,6 @@ void SwWrongList::Remove(sal_uInt16 nIdx, sal_uInt16 nLen )
 
 #if OSL_DEBUG_LEVEL > 0
     const int nOldSize = Count();
-    (void) nOldSize;
 #endif
 
     maList.erase(i1, i2);
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 10cd898d4f31..32bb6b256f99 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -165,7 +165,6 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwContentNode* pNd,
                     const SwDoc& rDoc = *pNd->GetDoc();
                     bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame );
                     OSL_ENSURE(bResult, "where is the text node");
-                    (void) bResult; // unused in non-debug
                     nPos = aPos.nNode.GetIndex();
                     nCntPos = aPos.nContent.GetIndex();
                 }
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index bd205152e0d4..6b64fdc367f8 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -333,7 +333,6 @@ sal_uInt16 SwFntObj::GetFontHeight( const SwViewShell* pSh, const OutputDevice&
             // Check if vcl did not change the meaning of GetTextHeight
             const FontMetric aOutMet( rRefDev.GetFontMetric() );
             long nTmpPrtHeight = (sal_uInt16)aOutMet.GetAscent() + aOutMet.GetDescent();
-            (void) nTmpPrtHeight;
             // #i106098#: do not compare with == here due to rounding error
             OSL_ENSURE( std::abs(nTmpPrtHeight - m_nPrtHeight) < 3,
                     "GetTextHeight != Ascent + Descent" );
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index e0095e77acf0..e304ec606597 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1434,7 +1434,6 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr, const SetAttrMode nMode )
                 {
                     const bool bSuccess = pDoc->GetFootnoteIdxs().insert(pTextFootnote).second;
                     OSL_ENSURE( bSuccess, "FootnoteIdx not inserted." );
-                    (void) bSuccess; // unused in non-debug
                 }
                 SwNodeIndex aTmpIndex( *this );
                 pDoc->GetFootnoteIdxs().UpdateFootnote( aTmpIndex);
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 65b6db6aad38..d35f7730cf9e 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -315,8 +315,7 @@ void SwUndoInsLayFormat::RepeatImpl(::sw::RepeatContext & rContext)
         OSL_FAIL( "What kind of anchor is this?" );
     }
 
-    SwFrameFormat* pFlyFormat = pDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFrameFormat, aAnchor, true, true );
-    (void) pFlyFormat;
+    (void) pDoc->getIDocumentLayoutAccess().CopyLayoutFormat( *pFrameFormat, aAnchor, true, true );
 }
 
 OUString SwUndoInsLayFormat::GetComment() const
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 703393ba557f..5ea7bf64624a 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -700,7 +700,6 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData
                 OUString aTableName, aStartCell, aEndCell;
                 bool bOk2 = GetTableAndCellsFromRangeRep(
                                     pSubRanges[i], aTableName, aStartCell, aEndCell );
-                (void) bOk2;
                 OSL_ENSURE( bOk2, "failed to get table and start/end cells" );
 
                 sal_Int32 nStartRow, nStartCol, nEndRow, nEndCol;
@@ -1119,7 +1118,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume
         {
             OSL_ENSURE( nCurLabelSeqLen == 0 && nCurValuesSeqLen == 1,
                     "trying to determine 'DataRowSource': something's fishy... should have been a single cell");
-            (void)nCurValuesSeqLen;
             nDirection = 0;     // default direction for a single cell should be 'columns'
         }
         else    // more than one cell is available (in values and label together!)
@@ -1896,7 +1894,6 @@ SwChartDataSequence::SwChartDataSequence(
     // which is required for some functions
     SwUnoTableCursor* pUnoTableCursor = dynamic_cast<SwUnoTableCursor*>(&(*m_pTableCursor));
     OSL_ENSURE(pUnoTableCursor, "SwChartDataSequence: cursor not SwUnoTableCursor");
-    (void) pUnoTableCursor;
 #endif
 }
 
@@ -1943,7 +1940,6 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     // which is required for some functions
     SwUnoTableCursor* pUnoTableCursor = dynamic_cast<SwUnoTableCursor*>(&(*m_pTableCursor));
     OSL_ENSURE(pUnoTableCursor, "SwChartDataSequence: cursor not SwUnoTableCursor");
-    (void) pUnoTableCursor;
 #endif
 }
 
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 0622012c867e..eec234294340 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -993,10 +993,7 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL,
             xReadStorage.set( ::comphelper::OStorageHelper::GetStorageFactory()->createInstanceWithArguments( aArgs ),
                               uno::UNO_QUERY );
         }
-        catch( const io::IOException& rEx)
-        {
-            (void)rEx;
-        }
+        catch( const io::IOException&) {}
     }
     if ( !pFilter )
     {
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 070d481a8878..81939304cd7c 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -743,7 +743,6 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
                     SwUnoCursorHelper::DocInsertStringSplitCR(
                         *pDoc, *pCurrent, rText, bForceExpandHints ) );
                 OSL_ENSURE( bSuccess, "Doc->Insert(Str) failed." );
-                (void) bSuccess;
 
                 SwUnoCursorHelper::SelectPam(*pUnoCursor, true);
                 pCurrent->Left(rText.getLength());
@@ -1707,8 +1706,7 @@ SwXTextCursor::setString(const OUString& aString)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
-    (void) rUnoCursor; // just to check if valid
+    m_pImpl->GetCursorOrThrow(); // just to check if valid
 
     const bool bForceExpandHints( (CursorType::Meta == m_pImpl->m_eType)
         && dynamic_cast<SwXMeta*>(m_pImpl->m_xParentText.get())
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 4fda0ca5e8d2..5df85d2fe7c9 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1558,7 +1558,6 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString)
         const bool bSuccess( SwUnoCursorHelper::DocInsertStringSplitCR(
                     *pDoc, rCursor, rString, false ) );
         OSL_ENSURE( bSuccess, "DocInsertStringSplitCR" );
-        (void) bSuccess;
         SwUnoCursorHelper::SelectPam(rCursor, true);
         rCursor.Left(rString.getLength());
     }
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 68c319125969..a712f9f57509 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1970,42 +1970,6 @@ lcl_ApplyRowProperties(
     }
 }
 
-#if OSL_DEBUG_LEVEL > 0
-//-->debug cell properties of all rows
-static void
-lcl_DebugCellProperties(
-    const uno::Sequence< uno::Sequence< uno::Sequence<
-        beans::PropertyValue > > >& rCellProperties)
-{
-    OUString sNames;
-    for (sal_Int32  nDebugRow = 0; nDebugRow < rCellProperties.getLength();
-         ++nDebugRow)
-    {
-        const uno::Sequence< beans::PropertyValues > aDebugCurrentRow =
-            rCellProperties[nDebugRow];
-        sal_Int32 nDebugCells = aDebugCurrentRow.getLength();
-        (void) nDebugCells;
-        for (sal_Int32  nDebugCell = 0; nDebugCell < nDebugCells;
-             ++nDebugCell)
-        {
-            const uno::Sequence< beans::PropertyValue >&
-                rDebugCellProperties = aDebugCurrentRow[nDebugCell];
-            const sal_Int32 nDebugCellProperties =
-                rDebugCellProperties.getLength();
-            for (sal_Int32  nDebugProperty = 0;
-                 nDebugProperty < nDebugCellProperties; ++nDebugProperty)
-            {
-                sNames += rDebugCellProperties[nDebugProperty].Name + "-";
-            }
-            sNames += "+";
-        }
-        sNames += "|";
-    }
-    (void)sNames;
-}
-//--<
-#endif
-
 static void
 lcl_ApplyCellProperties(
     const sal_Int32 nCell,
@@ -2274,10 +2238,6 @@ SwXText::convertToTable(
                 xRows->getByIndex(nRow), aRowSeparators[nRow]);
         }
 
-#if OSL_DEBUG_LEVEL > 0
-        lcl_DebugCellProperties(rCellProperties);
-#endif
-
         uno::Reference<table::XCellRange> const xCR(xRet, uno::UNO_QUERY_THROW);
         //apply cell properties
         for (sal_Int32 nRow = 0; nRow < rCellProperties.getLength(); ++nRow)
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index f5dde653a0e7..f383f822ab51 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1718,7 +1718,6 @@ bool SwHTMLParser::FileDownload( const OUString& rURL,
     // recreate View
     SwViewShell *const pVSh = CallStartAction( pOldVSh );
     OSL_ENSURE( pOldVSh == pVSh, "FileDownload: SwViewShell changed on us" );
-    (void) pVSh;
 
     return pStream!=nullptr;
 }
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 123c2d6b2eba..4439e5ebcb4b 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -1108,10 +1108,6 @@ void WW8TableCellGrid::addShadowCells()
 
     while (aTopsIt != getRowTopsEnd())
     {
-#ifdef DBG_UTIL
-        long nTop = *aTopsIt;
-        (void) nTop;
-#endif
         CellInfoMultiSet::const_iterator aCellIt = getCellsBegin(*aTopsIt);
         CellInfoMultiSet::const_iterator aCellEndIt = getCellsEnd(*aTopsIt);
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ac6af529a915..e86bdebe3718 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -249,7 +249,6 @@ void sw::util::RedlineStack::close( const SwPosition& rPos,
             bool const bResult =
                 pTabDesc->getOldRedlineStack()->close(rPos, eType);
             OSL_ENSURE( bResult, "close without open!");
-            (void) bResult; // unused in non-debug
         }
     }
 }
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 18e5ac15c3ab..536c1dc99783 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -612,7 +612,6 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet
             }
             OSL_ENSURE(bDone, "tab setting in numbering is "
                 "of unexpected configuration");
-            (void)bDone;
         }
         if ( rNumFormat.GetPositionAndSpaceMode() ==
                                   SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4030ccaee09d..ddff8244e7f7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4787,7 +4787,6 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16, const sal_uInt8* pData, sho
 
 sal_uInt32 SwWW8ImplReader::ExtractColour(const sal_uInt8* &rpData, bool bVer67)
 {
-    (void) bVer67; // unused in non-debug
     OSL_ENSURE(!bVer67, "Impossible");
     sal_uInt32 nFore = msfilter::util::BGRToRGB(SVBT32ToUInt32(rpData));
     rpData+=4;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 1f891c9cc002..216284b09160 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -229,19 +229,16 @@ ErrCode ReadThroughComponent(
     }
     catch(const packages::zip::ZipIOException& r)
     {
-        (void)r;
         SAL_WARN( "sw", "Zip exception caught while importing: " << r.Message);
         return ERRCODE_IO_BROKENPACKAGE;
     }
     catch(const io::IOException& r)
     {
-        (void)r;
         SAL_WARN( "sw", "IO exception caught while importing: " << r.Message);
         return ERR_SWG_READ_ERROR;
     }
     catch(const uno::Exception& r)
     {
-        (void)r;
         SAL_WARN( "sw", "uno exception caught while importing: " << r.Message );
         return ERR_SWG_READ_ERROR;
     }
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index e2ae8609105f..ee094fceaa01 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -764,7 +764,6 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
         else if ( (XML_NAMESPACE_XML == nPrefix) &&
                  IsXMLToken( aLocalName, XML_ID ) )
         {
-            (void) rValue;
         //FIXME where to put this??? columns do not actually exist in writer...
         }
     }
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 3a1f5b09870d..70770c5e98f2 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -1141,7 +1141,6 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
 
         sal_Int32 nTarget = xConfigItem->MoveResultSet(rInfo.nDBRow);
         OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
-        (void)nTarget;
         OSL_ENSURE( !sEMailColumn.isEmpty(), "No email column selected");
         OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess);
         SwMailDescriptor aDesc;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 4768e0166264..b6ffbe1dd6ab 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2849,10 +2849,7 @@ IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void)
         if(!sTemp.isEmpty())
             xFP->setDisplayDirectory(sTemp);
     }
-    catch( const uno::Exception& rEx )
-    {
-        (void) rEx;
-    }
+    catch( const uno::Exception& ) {}
     if( aDlgHelper.Execute() == ERRCODE_NONE )
     {
         pURLED->SetText( xFP->getSelectedFiles().getConstArray()[0] );
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index 2db995485093..221eefcadb61 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -167,10 +167,8 @@ void PageFooterPanel::NotifyItemUpdate(
     const sal_uInt16 nSid,
     const SfxItemState eState,
     const SfxPoolItem* pState,
-    const bool bIsEnabled)
+    const bool)
 {
-    (void)bIsEnabled;
-
     if (IsDisposed())
         return;
 
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index ad245f714c87..e94c03fad98c 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -138,10 +138,8 @@ void PageFormatPanel::NotifyItemUpdate(
     const sal_uInt16 nSId,
     const SfxItemState eState,
     const SfxPoolItem* pState,
-    const bool bIsEnabled)
+    const bool)
 {
-    (void)bIsEnabled;
-
     switch(nSId)
     {
         case SID_ATTR_PAGE_SIZE:
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index 919e5642c49e..af19cf1d1df6 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -170,10 +170,8 @@ void PageHeaderPanel::NotifyItemUpdate(
     const sal_uInt16 nSid,
     const SfxItemState eState,
     const SfxPoolItem* pState,
-    const bool bIsEnabled)
+    const bool)
 {
-    (void)bIsEnabled;
-
     if (IsDisposed())
         return;
 
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index e79e7ae9bd91..9edc8044612a 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -324,10 +324,8 @@ void PageStylesPanel::NotifyItemUpdate(
     const sal_uInt16 nSid,
     const SfxItemState eState,
     const SfxPoolItem* pState,
-    const bool bIsEnabled)
+    const bool)
 {
-    (void)bIsEnabled;
-
     if(IsDisposed())
         return;
 
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index d3954521b35a..cda2f2a15268 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -277,10 +277,8 @@ void WrapPropertyPanel::NotifyItemUpdate(
     const sal_uInt16 nSId,
     const SfxItemState eState,
     const SfxPoolItem* pState,
-    const bool bIsEnabled)
+    const bool)
 {
-    (void)bIsEnabled;
-
     if ( eState == SfxItemState::DEFAULT &&
         dynamic_cast< const SfxBoolItem *>( pState ) !=  nullptr )
     {
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index cc07d453d3e4..775741fe6588 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2351,7 +2351,6 @@ SwDoc * SwXTextDocument::GetRenderDoc(
             if (!rpView)
             {
                 bool bIsSwSrcView = false;
-                (void) bIsPDFExport;
                 // aside from maybe PDF export the view should always have been provided!
                 OSL_ENSURE( bIsPDFExport, "view is missing, guessing one..." );
 
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 73ac730d7299..c0574d174213 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -68,7 +68,6 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName,
                                    sal_Int32 nVersion,
                                    bool bTemplate /* = false */) const
 {
-    (void)bTemplate;
     OSL_ENSURE( !bTemplate, "No template for Writer Web" );
 
     if (nVersion == SOFFICE_FILEFORMAT_60)