loplugin:checkunusedparams in svtools

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

20 files changed, 117 insertions, 139 deletions

diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 9d96fcda4fa9..501825344785 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -1520,7 +1520,7 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol
         sal_uInt16 nFirstPos = nFirstCol;
         sal_uInt16 nWidth = (sal_uInt16)pColumn->Width();
         sal_uInt16 nLastPos = GetColumnAtXPosPixel(
-                            pDataWin->GetSizePixel().Width()-nWidth, false );
+                            pDataWin->GetSizePixel().Width()-nWidth );
         sal_uInt16 nFrozen = FrozenColCount();
         if ( bMakeVisible && nLastPos &&
              nNewPos >= nFrozen && ( nNewPos < nFirstPos || nNewPos > nLastPos ) )
@@ -2072,7 +2072,7 @@ tools::Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
 }
 
 
-sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const
+sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX ) const
 {
 
     // accumulate the widths of the visible columns
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index d5dfefab7c94..2c6842681b36 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -1200,18 +1200,11 @@ namespace svt
     }
 
 
-    void EditBrowseBox::PaintTristate(OutputDevice&, const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled) const
+    void EditBrowseBox::PaintTristate(const tools::Rectangle& rRect, const TriState& eState, bool _bEnabled) const
     {
         pCheckBoxPaint->GetBox().SetState(eState);
         pCheckBoxPaint->SetPosSizePixel(rRect.TopLeft(), rRect.GetSize());
 
-        // First update the parent, preventing that while painting this window
-        // an update for the parent is done (because it's in the queue already)
-        // which may lead to hiding this window immediately
-// #95598# comment out OJ
-/*      if (pCheckBoxPaint->GetParent())
-            pCheckBoxPaint->GetParent()->Update();
-*/
         pCheckBoxPaint->GetBox().Enable(_bEnabled);
         pCheckBoxPaint->Show();
         pCheckBoxPaint->SetParentUpdateMode( false );
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 3b35978460b4..7faf1a707fcd 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -242,11 +242,11 @@ class SvxIconChoiceCtrl_Impl
                         }
     void                InitScrollBarBox();
     void                ToggleSelection( SvxIconChoiceCtrlEntry* );
-    void                DeselectAllBut( SvxIconChoiceCtrlEntry*, bool bPaintSync = false );
+    void                DeselectAllBut( SvxIconChoiceCtrlEntry* );
     void                Center( SvxIconChoiceCtrlEntry* pEntry ) const;
     void                StopEditTimer() { aEditIdle.Stop(); }
     void                StartEditTimer() { aEditIdle.Start(); }
-    void                CallSelectHandler( SvxIconChoiceCtrlEntry* );
+    void                CallSelectHandler();
     void                SelectRect(
                             SvxIconChoiceCtrlEntry* pEntry1,
                             SvxIconChoiceCtrlEntry* pEntry2,
@@ -281,8 +281,7 @@ class SvxIconChoiceCtrl_Impl
     void                CancelUserEvents();
     void                EntrySelected(
                             SvxIconChoiceCtrlEntry* pEntry,
-                            bool bSelect,
-                            bool bSyncPaint
+                            bool bSelect
                         );
     void                RepaintSelectedEntries();
     void                SetListPositions();
@@ -327,8 +326,7 @@ public:
     void                SelectEntry(
                             SvxIconChoiceCtrlEntry*,
                             bool bSelect,
-                            bool bAddToSelection = false,
-                            bool bSyncPaint = false
+                            bool bAddToSelection = false
                         );
     void                Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
     bool                MouseButtonDown( const MouseEvent& );
@@ -339,8 +337,7 @@ public:
                             SvxIconChoiceCtrlEntry* pOldCursor,
                             SvxIconChoiceCtrlEntry* pNewCursor,
                             bool bMod1,
-                            bool bShift,
-                            bool bPaintSync
+                            bool bShift
                         );
     bool                KeyInput( const KeyEvent& );
     void                Resize();
@@ -381,9 +378,9 @@ public:
                             const OUString* pStr = nullptr
                         );
 
-    long                CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const;
-    long                CalcBoundingHeight( SvxIconChoiceCtrlEntry* ) const;
-    Size                CalcBoundingSize( SvxIconChoiceCtrlEntry* ) const;
+    long                CalcBoundingWidth() const;
+    long                CalcBoundingHeight() const;
+    Size                CalcBoundingSize() const;
     void                FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry );
     void                SetBoundingRect_Impl(
                             SvxIconChoiceCtrlEntry* pEntry,
@@ -415,7 +412,7 @@ public:
     void                SetGrid( const Size& );
     Size                GetMinGrid() const;
     void                Scroll( long nDeltaX, long nDeltaY );
-    const Size&         GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const;
+    const Size&         GetItemSize( IcnViewFieldType ) const;
 
     void                HideDDIcon();
 
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index a57732f9b6a6..d2d34011fb42 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -359,7 +359,7 @@ void SvxIconChoiceCtrl_Impl::SetListPositions()
 }
 
 void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool bSelect,
-    bool bAdd, bool bSyncPaint )
+    bool bAdd )
 {
     if( eSelectionMode == SelectionMode::NONE )
         return;
@@ -369,7 +369,7 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool b
         if ( !( nFlags & IconChoiceFlags::ClearingSelection ) )
         {
             nFlags |= IconChoiceFlags::ClearingSelection;
-            DeselectAllBut( pEntry, true );
+            DeselectAllBut( pEntry );
             nFlags &= ~IconChoiceFlags::ClearingSelection;
         }
     }
@@ -382,20 +382,20 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool b
             nEntryFlags |= SvxIconViewFlags::SELECTED;
             pEntry->AssignFlags( nEntryFlags );
             nSelectionCount++;
-            CallSelectHandler( pEntry );
+            CallSelectHandler();
         }
         else
         {
             nEntryFlags &= ~( SvxIconViewFlags::SELECTED);
             pEntry->AssignFlags( nEntryFlags );
             nSelectionCount--;
-            CallSelectHandler( nullptr );
+            CallSelectHandler();
         }
-        EntrySelected( pEntry, bSelect, bSyncPaint );
+        EntrySelected( pEntry, bSelect );
     }
 }
 
-void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool bSelect, bool /*bSyncPaint*/)
+void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool bSelect)
 {
     // When using SingleSelection, make sure that the cursor is always placed
     // over the (only) selected entry. (But only if a cursor exists.)
@@ -739,7 +739,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
     if( rMEvt.IsShift() && eSelectionMode != SelectionMode::Single )
     {
         if( pEntry )
-            SetCursor_Impl( pCursor, pEntry, rMEvt.IsMod1(), rMEvt.IsShift(), true);
+            SetCursor_Impl( pCursor, pEntry, rMEvt.IsMod1(), rMEvt.IsShift() );
         return true;
     }
 
@@ -803,7 +803,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
     if( rMEvt.GetClicks() == 2 )
     {
         DeselectAllBut( pEntry );
-        SelectEntry( pEntry, true, false, true );
+        SelectEntry( pEntry, true, false );
         pHdlEntry = pEntry;
         pView->ClickIcon();
     }
@@ -843,9 +843,9 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonDown( const MouseEvent& rMEvt)
             {
                 if( !bSelected )
                 {
-                    DeselectAllBut( pEntry, true /* paint synchronously */ );
+                    DeselectAllBut( pEntry );
                     SetCursor( pEntry );
-                    SelectEntry( pEntry, true, false, true );
+                    SelectEntry( pEntry, true, false );
                 }
                 else
                 {
@@ -890,7 +890,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt )
         {
             DeselectAllBut( pDocEntry );
             SetCursor( pDocEntry );
-            SelectEntry( pDocEntry, true, false, true );
+            SelectEntry( pDocEntry, true, false );
             bHandled = true;
         }
     }
@@ -916,7 +916,7 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt )
 
         // set focus on Icon
         SvxIconChoiceCtrlEntry* pOldCursor = pCursor;
-        SetCursor_Impl( pOldCursor, pHdlEntry, false, false, true );
+        SetCursor_Impl( pOldCursor, pHdlEntry, false, false );
 
         pHdlEntry = nullptr;
     }
@@ -940,7 +940,7 @@ bool SvxIconChoiceCtrl_Impl::MouseMove( const MouseEvent& rMEvt )
 }
 
 void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor,
-    SvxIconChoiceCtrlEntry* pNewCursor, bool bMod1, bool bShift, bool bPaintSync )
+    SvxIconChoiceCtrlEntry* pNewCursor, bool bMod1, bool bShift )
 {
     if( pNewCursor )
     {
@@ -957,7 +957,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor,
             }
         }
         if( bDeselectAll )
-            DeselectAllBut( pFilterEntry, bPaintSync );
+            DeselectAllBut( pFilterEntry );
         ShowCursor( false );
         MakeEntryVisible( pNewCursor );
         SetCursor( pNewCursor );
@@ -980,7 +980,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor,
         }
         else
         {
-            SelectEntry( pCursor, true, false, bPaintSync );
+            SelectEntry( pCursor, true, false );
             aCurSelectionRect = GetEntryBoundRect( pCursor );
             CallEventListeners( VclEventId::ListboxSelect, pCursor );
         }
@@ -1000,7 +1000,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
         SvxIconChoiceCtrlEntry* pNewCursor = GetEntry( nPos );
         SvxIconChoiceCtrlEntry* pOldCursor = pCursor;
         if ( pNewCursor != pOldCursor )
-            SetCursor_Impl( pOldCursor, pNewCursor, false, false, false );
+            SetCursor_Impl( pOldCursor, pNewCursor, false, false );
         return true;
     }
 
@@ -1036,7 +1036,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
                     pNewCursor = pImpCursor->GoUpDown(pCursor,false);
                 else
                     pNewCursor = pImpCursor->GoPageUpDown(pCursor,false);
-                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true );
+                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift );
                 if( !pNewCursor )
                 {
                     tools::Rectangle aRect( GetEntryBoundRect( pCursor ) );
@@ -1066,7 +1066,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
                     pNewCursor=pImpCursor->GoUpDown( pCursor,true );
                 else
                     pNewCursor=pImpCursor->GoPageUpDown( pCursor,true );
-                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true );
+                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift );
 
                 if ( bChooseWithCursor && pNewCursor != nullptr)
                 {
@@ -1082,7 +1082,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
             if( pCursor )
             {
                 pNewCursor=pImpCursor->GoLeftRight(pCursor,true );
-                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true );
+                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift );
             }
             break;
 
@@ -1091,7 +1091,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
             {
                 MakeEntryVisible( pCursor );
                 pNewCursor = pImpCursor->GoLeftRight(pCursor,false );
-                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true );
+                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift );
                 if( !pNewCursor )
                 {
                     tools::Rectangle aRect( GetEntryBoundRect(pCursor));
@@ -1190,7 +1190,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
             if( pCursor )
             {
                 pNewCursor = aEntries[ aEntries.size() - 1 ];
-                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true );
+                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift );
             }
             break;
 
@@ -1198,7 +1198,7 @@ bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
             if( pCursor )
             {
                 pNewCursor = aEntries[ 0 ];
-                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift, true );
+                SetCursor_Impl( pOldCursor, pNewCursor, bMod1, bShift );
             }
             break;
 
@@ -1558,7 +1558,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem(const tools::Rectangle& rRect,
 {
     if (eItem == IcnViewFieldType::Text)
     {
-        OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false);
+        OUString aText = SvtIconChoiceCtrl::GetEntryText(pEntry);
 
         rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags);
 
@@ -1593,7 +1593,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
 
     rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
 
-    OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry, false));
+    OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry));
     tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, false, &aEntryText));
     tools::Rectangle aBmpRect(CalcBmpRect(pEntry, &rPos));
 
@@ -1705,7 +1705,7 @@ void SvxIconChoiceCtrl_Impl::SetNoSelection()
     if( !(nFlags & IconChoiceFlags::ClearingSelection ))
     {
         nFlags |= IconChoiceFlags::ClearingSelection;
-        DeselectAllBut( nullptr, true );
+        DeselectAllBut( nullptr );
         nFlags &= ~IconChoiceFlags::ClearingSelection;
     }
 }
@@ -1799,7 +1799,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
 {
     OUString aEntryText;
     if( !pStr )
-        aEntryText = SvtIconChoiceCtrl::GetEntryText( pEntry, bEdit );
+        aEntryText = SvtIconChoiceCtrl::GetEntryText( pEntry );
     else
         aEntryText = *pStr;
 
@@ -1854,10 +1854,9 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
 }
 
 
-long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry ) const
+long SvxIconChoiceCtrl_Impl::CalcBoundingWidth() const
 {
-    long nStringWidth = GetItemSize( pEntry, IcnViewFieldType::Text ).Width();
-//  nStringWidth += 2*LROFFS_TEXT;
+    long nStringWidth = GetItemSize( IcnViewFieldType::Text ).Width();
     long nWidth = 0;
 
     switch( nWinBits & (VIEWMODE_MASK) )
@@ -1876,9 +1875,9 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry )
     return nWidth;
 }
 
-long SvxIconChoiceCtrl_Impl::CalcBoundingHeight( SvxIconChoiceCtrlEntry* pEntry ) const
+long SvxIconChoiceCtrl_Impl::CalcBoundingHeight() const
 {
-    long nStringHeight = GetItemSize( pEntry, IcnViewFieldType::Text).Height();
+    long nStringHeight = GetItemSize(IcnViewFieldType::Text).Height();
     long nHeight = 0;
 
     switch( nWinBits & (VIEWMODE_MASK) )
@@ -1903,10 +1902,9 @@ long SvxIconChoiceCtrl_Impl::CalcBoundingHeight( SvxIconChoiceCtrlEntry* pEntry
     return nHeight;
 }
 
-Size SvxIconChoiceCtrl_Impl::CalcBoundingSize( SvxIconChoiceCtrlEntry* pEntry ) const
+Size SvxIconChoiceCtrl_Impl::CalcBoundingSize() const
 {
-    return Size( CalcBoundingWidth( pEntry ),
-                 CalcBoundingHeight( pEntry ) );
+    return Size( CalcBoundingWidth(), CalcBoundingHeight() );
 }
 
 void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRectsSmart()
@@ -1964,7 +1962,7 @@ void SvxIconChoiceCtrl_Impl::FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry )
         AdjustVirtSize( pEntry->aRect );
         return;
     }
-    Size aSize( CalcBoundingSize( pEntry ) );
+    Size aSize( CalcBoundingSize() );
     Point aPos(pGridMap->GetGridRect(pGridMap->GetUnoccupiedGrid()).TopLeft());
     SetBoundingRect_Impl( pEntry, aPos, aSize );
 }
@@ -2267,8 +2265,7 @@ void SvxIconChoiceCtrl_Impl::ToggleSelection( SvxIconChoiceCtrlEntry* pEntry )
     SelectEntry( pEntry, bSel, true );
 }
 
-void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryNot,
-    bool bPaintSync )
+void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryNot )
 {
     ClearSelectedRectList();
 
@@ -2279,7 +2276,7 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryN
     {
         SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
         if( pEntry != pThisEntryNot && pEntry->IsSelected() )
-            SelectEntry( pEntry, false, true, bPaintSync );
+            SelectEntry( pEntry, false, true );
     }
     pAnchor = nullptr;
     nFlags &= (~IconChoiceFlags::AddMode);
@@ -2402,7 +2399,7 @@ void SvxIconChoiceCtrl_Impl::SetDefaultTextSize()
 void SvxIconChoiceCtrl_Impl::Center( SvxIconChoiceCtrlEntry* pEntry ) const
 {
     pEntry->aRect = pEntry->aGridRect;
-    Size aSize( CalcBoundingSize( pEntry ) );
+    Size aSize( CalcBoundingSize() );
     if( nWinBits & WB_ICON )
     {
         // center horizontally
@@ -2431,8 +2428,7 @@ void SvxIconChoiceCtrl_Impl::Scroll( long nDeltaX, long nDeltaY )
 }
 
 
-const Size& SvxIconChoiceCtrl_Impl::GetItemSize( SvxIconChoiceCtrlEntry*,
-    IcnViewFieldType eItem ) const
+const Size& SvxIconChoiceCtrl_Impl::GetItemSize( IcnViewFieldType eItem ) const
 {
     if (eItem == IcnViewFieldType::Text)
         return aDefaultTextSize;
@@ -2589,7 +2585,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
         {
             pEntry = GetEntry( i );
             if( pEntry->IsSelected() )
-                SelectEntry( pEntry, false, true, true );
+                SelectEntry( pEntry, false, true );
         }
     }
 
@@ -2598,7 +2594,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
     {
         pEntry = GetEntry( i );
         if( ! pEntry->IsSelected() )
-            SelectEntry( pEntry, true, true, true );
+            SelectEntry( pEntry, true, true );
     }
 
     if ( ! bAdd )
@@ -2610,7 +2606,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange(
         {
             pEntry = GetEntry( i );
             if( pEntry->IsSelected() )
-                SelectEntry( pEntry, false, true, true );
+                SelectEntry( pEntry, false, true );
         }
     }
 }
@@ -2814,7 +2810,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
     SetNoSelection();
 
     pCurEditedEntry = pEntry;
-    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, true ) );
+    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) );
     tools::Rectangle aRect( CalcTextRect( pEntry, nullptr, true, &aEntryText ) );
     MakeVisible( aRect );
     Point aPos( aRect.TopLeft() );
@@ -2916,13 +2912,11 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry() const
 
 void SvxIconChoiceCtrl_Impl::SelectAll()
 {
-    bool bPaint = true;
-
     size_t nCount = aEntries.size();
     for( size_t nCur = 0; nCur < nCount; nCur++ )
     {
         SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
-        SelectEntry( pEntry, true/*bSelect*/, true, bPaint );
+        SelectEntry( pEntry, true/*bSelect*/, true );
     }
     nFlags &= (~IconChoiceFlags::AddMode);
     pAnchor = nullptr;
@@ -3271,7 +3265,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
         return false;
 
     OUString sQuickHelpText = pEntry->GetQuickHelpText();
-    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) );
+    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) );
     tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, false, &aEntryText ) );
     if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
         return false;
@@ -3384,7 +3378,7 @@ void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEn
     }
 }
 
-void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* )
+void SvxIconChoiceCtrl_Impl::CallSelectHandler()
 {
     // When single-click mode is active, the selection handler should be called
     // synchronously, as the selection is automatically taken away once the
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 41c113867ffd..7a7f6d29d7b0 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -107,7 +107,7 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
     rDev.DrawImage( rPos, pEntry->GetImage() );
 }
 
-OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry )
 {
     return pEntry->GetText();
 }
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index d6b3980bd9db..092f4cdaa021 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1458,7 +1458,7 @@ long SvImpLBox::GetEntryLine( SvTreeListEntry* pEntry ) const
     return nFirstVisPos;
 }
 
-void SvImpLBox::SetEntryHeight( short /* nHeight */ )
+void SvImpLBox::SetEntryHeight()
 {
     SetNodeBmpYOffset( GetExpandedNodeBmp() );
     SetNodeBmpYOffset( GetCollapsedNodeBmp() );
@@ -1862,7 +1862,7 @@ void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry )
 
 // ****** Control the control animation
 
-bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /*nY*/)
+bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry)
 {
     SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab);
     if (pItem && pItem->GetType() == SvLBoxItemType::Button)
@@ -1917,7 +1917,7 @@ bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt )
         pActiveButton->SetStateHilighted( false );
         long nMouseX = rMEvt.GetPosPixel().X();
         if (pEntry == pActiveEntry && pView->GetItem(pActiveEntry, nMouseX) == pActiveButton)
-            pActiveButton->ClickHdl(pView, pActiveEntry);
+            pActiveButton->ClickHdl(pActiveEntry);
         InvalidateEntry(pActiveEntry);
         if (pCursor == pActiveEntry)
             ShowCursor(true);
@@ -1955,7 +1955,7 @@ bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry )
 }
 
 // false == hit no node button
-bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /* nY */ )
+bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvTreeListEntry* pEntry )
 {
     bool bRet = false;
 
@@ -2005,7 +2005,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
 
     long nY = GetEntryLine( pEntry );
     // Node-Button?
-    if( ButtonDownCheckExpand( rMEvt, pEntry, nY ) )
+    if( ButtonDownCheckExpand( rMEvt, pEntry ) )
         return;
 
     if( !EntryReallyHit(pEntry,aPos,nY))
@@ -2059,7 +2059,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
     else
     {
         // CheckButton? (TreeListBox: Check + Info)
-        if( ButtonDownCheckCtrl(rMEvt, pEntry, nY) )
+        if( ButtonDownCheckCtrl(rMEvt, pEntry) )
             return;
         // Inplace-Editing?
     }
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 6b7d4e4b96df..7e1cb420a7d7 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -271,7 +271,7 @@ SvLBoxItemType SvLBoxButton::GetType() const
     return SvLBoxItemType::Button;
 }
 
-bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry )
+bool SvLBoxButton::ClickHdl( SvTreeListEntry* pEntry )
 {
     if ( CheckModification() )
     {
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 844dc178cc65..bd8d55e3a1b6 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -48,8 +48,8 @@ struct SvListView::Impl
     void InitTable();
     void RemoveViewData( SvTreeListEntry* pParent );
 
-    void ActionMoving(SvTreeListEntry* pEntry, SvTreeListEntry* pTargetPrnt, sal_uLong nChildPos);
-    void ActionMoved(SvTreeListEntry* pEntry, SvTreeListEntry* pTargetPrnt, sal_uLong nChildPos);
+    void ActionMoving(SvTreeListEntry* pEntry);
+    void ActionMoved();
     void ActionInserted(SvTreeListEntry* pEntry);
     void ActionInsertedTree(SvTreeListEntry* pEntry);
     void ActionRemoving(SvTreeListEntry* pEntry);
@@ -1292,7 +1292,7 @@ void SvListView::ModelHasEntryInvalidated( SvTreeListEntry*)
 {
 }
 
-void SvListView::Impl::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLong)
+void SvListView::Impl::ActionMoving( SvTreeListEntry* pEntry )
 {
     SvTreeListEntry* pParent = pEntry->pParent;
     DBG_ASSERT(pParent,"Model not consistent");
@@ -1306,9 +1306,7 @@ void SvListView::Impl::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sa
     m_bVisPositionsValid = false;
 }
 
-void SvListView::Impl::ActionMoved( SvTreeListEntry* /* pEntry */ ,
-                            SvTreeListEntry* /* pTargetPrnt */ ,
-                            sal_uLong /* nChildPos */ )
+void SvListView::Impl::ActionMoved()
 {
     m_nVisibleCount = 0;
     m_bVisPositionsValid = false;
@@ -1426,10 +1424,10 @@ void SvListView::ModelNotification( SvListAction nActionId, SvTreeListEntry* pEn
             break;
         case SvListAction::MOVING:
             ModelIsMoving( pEntry1, pEntry2, nPos );
-            m_pImpl->ActionMoving( pEntry1, pEntry2, nPos );
+            m_pImpl->ActionMoving( pEntry1 );
             break;
         case SvListAction::MOVED:
-            m_pImpl->ActionMoved( pEntry1, pEntry2, nPos );
+            m_pImpl->ActionMoved();
             ModelHasMoved( pEntry1 );
             break;
         case SvListAction::CLEARING:
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index cfe4dc630c9b..287b727ff53c 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2155,7 +2155,7 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry )
     {
         nEntryHeight = nHeightMax;
         Control::SetFont( GetFont() );
-        pImpl->SetEntryHeight( nHeightMax );
+        pImpl->SetEntryHeight();
     }
 }
 
@@ -2169,7 +2169,7 @@ void SvTreeListBox::SetEntryHeight( short nHeight, bool bForce )
         else
             nTreeFlags &= ~SvTreeFlags::FIXEDHEIGHT;
         Control::SetFont( GetFont() );
-        pImpl->SetEntryHeight( nHeight );
+        pImpl->SetEntryHeight();
     }
 }
 
@@ -2185,7 +2185,7 @@ void SvTreeListBox::AdjustEntryHeight( const Image& rBmp )
     if( aSize.Height() > nEntryHeight )
     {
         nEntryHeight = (short)aSize.Height() + nEntryHeightOffs;
-        pImpl->SetEntryHeight( nEntryHeight );
+        pImpl->SetEntryHeight();
     }
 }
 
@@ -2195,7 +2195,7 @@ void SvTreeListBox::AdjustEntryHeight()
     if( aSize.Height()  >  nEntryHeight )
     {
         nEntryHeight = (short)aSize.Height() + nEntryHeightOffs;
-        pImpl->SetEntryHeight( nEntryHeight );
+        pImpl->SetEntryHeight();
     }
 }
 
@@ -2449,7 +2449,7 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic )
         nEntryHeightOffs = nOffsLogic;
         nEntryHeight = nEntryHeight + nOffsLogic;
         AdjustEntryHeightAndRecalc();
-        pImpl->SetEntryHeight( nEntryHeight );
+        pImpl->SetEntryHeight();
     }
 }
 
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 0b5bc8de630c..37bd3683895b 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -275,7 +275,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos )
 }
 
 void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
-                             const tools::Rectangle& rItemRect, const tools::Rectangle* pRect, DrawFlags )
+                             const tools::Rectangle& rItemRect, const tools::Rectangle* pRect )
 {
     ImplControlValue aControlValue(0);
     tools::Rectangle aCtrlRegion;
@@ -609,7 +609,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos
                              bool bHigh, const tools::Rectangle* pRect )
 {
     tools::Rectangle aRect = ImplGetItemRect(nPos);
-    ImplDrawItem(rRenderContext, nPos, bHigh, aRect, pRect, DrawFlags::NONE );
+    ImplDrawItem(rRenderContext, nPos, bHigh, aRect, pRect );
 }
 
 void HeaderBar::ImplUpdate(sal_uInt16 nPos, bool bEnd)
@@ -977,7 +977,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
             aItemRect.Right() = 16000;
         vcl::Region aRegion( aRect );
         pDev->SetClipRegion( aRegion );
-        ImplDrawItem(*pDev, i, false, aItemRect, &aRect, nFlags );
+        ImplDrawItem(*pDev, i, false, aItemRect, &aRect );
         pDev->SetClipRegion();
     }
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 11c2e938dd18..b459522cc7b3 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1149,7 +1149,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& r
     if (!nItemCount)
         return;
 
-    ImplPrePaint(rRenderContext);
+    ImplPrePaint();
 
     Color aFaceColor, aSelectColor, aFaceTextColor, aSelectTextColor;
     const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
@@ -1528,7 +1528,7 @@ bool TabBar::ImplDeactivatePage()
     return bRet;
 }
 
-void TabBar::ImplPrePaint(vcl::RenderContext& /*rRenderContext*/)
+void TabBar::ImplPrePaint()
 {
     sal_uInt16 nItemCount = mpImpl->getItemSize();
     if (!nItemCount)
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index f419975e1cc7..92d23b77f701 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -847,7 +847,7 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry )
 
 void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    implHighlightAtPosition(rMEvt, true);
+    implHighlightAtPosition(rMEvt);
     implSelectEntry(mpImpl->mnHighlightedEntry);
 }
 
@@ -862,11 +862,11 @@ void ToolbarMenu::MouseMove( const MouseEvent& rMEvt )
     if (!IsVisible())
         return;
 
-    implHighlightAtPosition(rMEvt, false);
+    implHighlightAtPosition(rMEvt);
 }
 
 
-void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt, bool /*bMBDown*/)
+void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt)
 {
     long nMouseY = rMEvt.GetPosPixel().Y();
     Size aOutSz = GetOutputSizePixel();
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index c018a533dc4e..fe31de3fb51e 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -172,7 +172,7 @@ public:
     bool                HasGraphicObjectReference( const GraphicObject& rObj );
 
     void                TryToSwapIn();
-    void                GraphicObjectWasSwappedOut( const GraphicObject& rObj );
+    void                GraphicObjectWasSwappedOut();
     void                GraphicObjectWasSwappedIn( const GraphicObject& rObj );
 };
 
@@ -364,7 +364,7 @@ void GraphicCacheEntry::TryToSwapIn()
         maGraphicObjectList.front()->FireSwapInRequest();
 }
 
-void GraphicCacheEntry::GraphicObjectWasSwappedOut( const GraphicObject& /*rObj*/ )
+void GraphicCacheEntry::GraphicObjectWasSwappedOut()
 {
     mbSwappedAll = true;
 
@@ -989,7 +989,7 @@ void GraphicCache::GraphicObjectWasSwappedOut( const GraphicObject& rObj )
     GraphicCacheEntry* pEntry = ImplGetCacheEntry( rObj );
 
     if( pEntry )
-        pEntry->GraphicObjectWasSwappedOut( rObj );
+        pEntry->GraphicObjectWasSwappedOut();
 }
 
 void GraphicCache::GraphicObjectWasSwappedIn( const GraphicObject& rObj )
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 15ca2242f68f..35288085a287 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -127,7 +127,7 @@ bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size&
         {
             // cached/direct drawing
             if( !mpCache->DrawDisplayCacheObj( pOut, aPt, aSz, rObj, rAttr ) )
-                bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, nFlags, rCached );
+                bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, rCached );
             else
                 bRet = rCached = true;
         }
@@ -232,7 +232,7 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj )
 bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                                const Size& rSz, GraphicObject& rObj,
                                const GraphicAttr& rAttr,
-                               const GraphicManagerDrawFlags nFlags, bool& rCached )
+                               bool& rCached )
 {
     const Graphic&  rGraphic = rObj.GetGraphic();
     bool            bRet = false;
@@ -250,7 +250,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
             {
                 BitmapEx aDstBmpEx;
 
-                if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) )
+                if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, &aDstBmpEx ) )
                 {
                     rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
                     bRet = true;
@@ -258,7 +258,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
             }
 
             if( !bRet )
-                bRet = ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags );
+                bRet = ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr );
         }
         else
         {
@@ -269,7 +269,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                 GDIMetaFile aDstMtf;
                 BitmapEx    aContainedBmpEx;
 
-                if( ImplCreateOutput( pOut, rPt, rSz, rSrcMtf, rAttr, nFlags, aDstMtf, aContainedBmpEx ) )
+                if( ImplCreateOutput( pOut, rPt, rSz, rSrcMtf, rAttr, aDstMtf, aContainedBmpEx ) )
                 {
                     if( !!aContainedBmpEx )
                     {
@@ -277,7 +277,7 @@ bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
                         // bitmap (allows caching the resulting pixmap).
                         BitmapEx aDstBmpEx;
 
-                        if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) )
+                        if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, &aDstBmpEx ) )
                         {
                             rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
                             bRet = true;
@@ -872,7 +872,7 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib
 bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
                                        const Point& rPoint, const Size& rSize,
                                        const BitmapEx& rBitmapEx, const GraphicAttr& rAttributes,
-                                       const GraphicManagerDrawFlags /*nFlags*/, BitmapEx* pBmpEx )
+                                       BitmapEx* pBmpEx )
 {
     sal_uInt16  nRot10 = rAttributes.GetRotation() % 3600;
 
@@ -1089,7 +1089,7 @@ static BitmapEx checkMetadataBitmap( const BitmapEx& rBmpEx,
 bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
                                        const Point& rPt, const Size& rSz,
                                        const GDIMetaFile& rMtf, const GraphicAttr& rAttr,
-                                       const GraphicManagerDrawFlags /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx )
+                                       GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx )
 {
     const Size aNewSize( rMtf.GetPrefSize() );
 
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index c2dc34ff6293..929e714ed7a9 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -172,10 +172,10 @@ private:
     void                SetAnchorSelection( SvTreeListEntry* pOld,
                             SvTreeListEntry* pNewCursor );
     void                BeginDrag();
-    bool ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long nY );
+    bool ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry );
     bool MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry );
     bool ButtonUpCheckCtrl( const MouseEvent& rMEvt );
-    bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry*,long nY );
+    bool ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry* );
 
     bool EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPos, long nLine);
     void                InitScrollBarBox();
@@ -271,7 +271,7 @@ public:
     void                GetFocus();
     void                LoseFocus();
     virtual void        UpdateAll( bool bInvalidateCompleteView );
-    void                SetEntryHeight( short nHeight );
+    void                SetEntryHeight();
     void                InvalidateEntry( SvTreeListEntry* );
     void                RecalcFocusRect();
 
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index c91350006246..3994929b69b0 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -94,7 +94,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo
                 {
                     TransferableObjectDescriptor aDesc;
                     FillTransferableObjectDescriptor( aDesc, m_xObj, m_pGraphic, m_nAspect );
-                    bRet = SetTransferableObjectDescriptor( aDesc, rFlavor );
+                    bRet = SetTransferableObjectDescriptor( aDesc );
                 }
                 else if( nFormat == SotClipboardFormatId::EMBED_SOURCE )
                 {
@@ -142,7 +142,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo
                             bRet = ( aSeq.getLength() > 0 );
                             if( bRet )
                             {
-                                SetAny( uno::Any(aSeq), rFlavor );
+                                SetAny( uno::Any(aSeq) );
                             }
                         }
                         else
@@ -164,7 +164,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo
                     uno::Any aAny;
                     aAny <<= uno::Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ),
                                                     aMemStm.Seek( STREAM_SEEK_TO_END ) );
-                    SetAny( aAny, rFlavor );
+                    SetAny( aAny );
                     bRet = true;
                 }
                 else if ( ( nFormat == SotClipboardFormatId::BITMAP || nFormat == SotClipboardFormatId::PNG ) && m_pGraphic )
@@ -177,7 +177,7 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo
                     if ( xTransferable.is() )
                     {
                         uno::Any aAny = xTransferable->getTransferData( rFlavor );
-                        SetAny( aAny, rFlavor );
+                        SetAny( aAny );
                         bRet = true;
                     }
                 }
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 19d87badf38a..437745bc9106 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -621,7 +621,7 @@ void TransferableHelper::ClearFormats()
 }
 
 
-bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& )
+bool TransferableHelper::SetAny( const Any& rAny )
 {
     maAny = rAny;
     return( maAny.hasValue() );
@@ -678,7 +678,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo
 }
 
 
-bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& )
+bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf )
 {
     if( rMtf.GetActionSize() )
     {
@@ -692,7 +692,7 @@ bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlav
 }
 
 
-bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& )
+bool TransferableHelper::SetGraphic( const Graphic& rGraphic )
 {
     if( rGraphic.GetType() != GraphicType::NONE )
     {
@@ -708,7 +708,7 @@ bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor&
 }
 
 
-bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& )
+bool TransferableHelper::SetImageMap( const ImageMap& rIMap )
 {
     SvMemoryStream aMemStm( 8192, 8192 );
 
@@ -720,8 +720,7 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatran
 }
 
 
-bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc,
-                                                          const css::datatransfer::DataFlavor& )
+bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc )
 {
     PrepareOLE( rDesc );
 
@@ -1779,11 +1778,11 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r
 bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc )
 {
     DataFlavor aFlavor;
-    return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( aFlavor, rDesc ) );
+    return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( rDesc ) );
 }
 
 
-bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc )
+bool TransferableDataHelper::GetTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc )
 {
     rDesc = *mxObjDesc;
     return true;
@@ -1957,13 +1956,11 @@ bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat,
                                                 FileList& rFileList )
 {
     DataFlavor aFlavor;
-    return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetFileList( aFlavor, rFileList ) );
+    return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetFileList( rFileList ) );
 }
 
 
-bool TransferableDataHelper::GetFileList(
-            const css::datatransfer::DataFlavor&,
-            FileList& rFileList )
+bool TransferableDataHelper::GetFileList( FileList& rFileList )
 {
     tools::SvRef<SotStorageStream> xStm;
     bool                bRet = false;
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 49da3de0e482..34a55d768d58 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -376,7 +376,7 @@ bool TransferDataContainer::GetData(
         TDataCntnrEntry_Impl& rEntry = (TDataCntnrEntry_Impl&)*aIter;
         if( nFmtId == rEntry.nId )
         {
-            bFnd = SetAny( rEntry.aAny, rFlavor );
+            bFnd = SetAny( rEntry.aAny );
             break;
         }
     }
@@ -400,7 +400,7 @@ bool TransferDataContainer::GetData(
         case SotClipboardFormatId::BITMAP:
         case SotClipboardFormatId::GDIMETAFILE:
             if( pImpl->pGrf )
-                bFnd = SetGraphic( *pImpl->pGrf, rFlavor );
+                bFnd = SetGraphic( *pImpl->pGrf );
             break;
         default: break;
         }
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index ccfd5da20a82..c52207e10f32 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -581,8 +581,7 @@ SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nL
 }
 
 
-SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor,
-                                   rtl_TextEncoding )
+SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor )
 {
     rStream.WriteCharPtr( "\"#" );
     if( rColor.GetColor() == COL_AUTO )
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index c2bf4a7145da..388b6240cb82 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -505,7 +505,7 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents()
 class SvUnoImageMap : public WeakImplHelper< XIndexContainer, XServiceInfo, XUnoTunnel >
 {
 public:
-    explicit SvUnoImageMap( const SvEventDescription* pSupportedMacroItems );
+    explicit SvUnoImageMap();
     SvUnoImageMap( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems );
 
     bool fillImageMap( ImageMap& rMap ) const;
@@ -542,7 +542,7 @@ private:
 
 UNO3_GETIMPLEMENTATION_IMPL( SvUnoImageMap );
 
-SvUnoImageMap::SvUnoImageMap( const SvEventDescription* )
+SvUnoImageMap::SvUnoImageMap()
 {
 }
 
@@ -706,9 +706,9 @@ Reference< XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEvent
     return static_cast<XWeak*>(new SvUnoImageMapObject( IMAP_OBJ_POLYGON, pSupportedMacroItems ));
 }
 
-Reference< XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems )
+Reference< XInterface > SvUnoImageMap_createInstance()
 {
-    return static_cast<XWeak*>(new SvUnoImageMap( pSupportedMacroItems ));
+    return static_cast<XWeak*>(new SvUnoImageMap);
 }
 
 Reference< XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems )