From 67d5fbe0d0f63407e768d329ec7a2bdc131fdaf9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 18 Oct 2019 10:53:06 +0200 Subject: loplugin:virtualdead unused param in ITableRenderer Change-Id: I008ff69494af305485a022def72a14a04b26a19e Reviewed-on: https://gerrit.libreoffice.org/81183 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svtools/inc/table/gridtablerenderer.hxx | 5 ++--- svtools/source/table/gridtablerenderer.cxx | 5 ++--- svtools/source/table/tablecontrol_impl.cxx | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'svtools') diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index abd3ff7ac161..b19ed9dd25aa 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -70,14 +70,13 @@ namespace svt { namespace table vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea, const StyleSettings& _rStyle ) override; - virtual void PaintColumnHeader( ColPos _nCol, bool _bActive, + virtual void PaintColumnHeader( ColPos _nCol, vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea, const StyleSettings& _rStyle ) override; virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected, vcl::RenderContext& _rDevice, const tools::Rectangle& _rRowArea, const StyleSettings& _rStyle ) override; virtual void PaintRowHeader( - bool i_hasControlFocus, bool _bSelected, vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea, const StyleSettings& _rStyle ) override; virtual void PaintCell( ColPos const i_col, @@ -85,7 +84,7 @@ namespace svt { namespace table vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea, const StyleSettings& _rStyle ) override; virtual void ShowCellCursor( vcl::Window& _rView, const tools::Rectangle& _rCursorRect) override; - virtual void HideCellCursor( vcl::Window& _rView, const tools::Rectangle& _rCursorRect) override; + virtual void HideCellCursor( vcl::Window& _rView ) override; virtual bool FitsIntoCell( css::uno::Any const & i_cellContent, OutputDevice& i_targetDevice, tools::Rectangle const & i_targetArea diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index d7b1910ee11c..d28a8a7f5b49 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -237,7 +237,6 @@ namespace svt { namespace table void GridTableRenderer::PaintColumnHeader( ColPos _nCol, - bool, // _bActive: no special painting for the active column at the moment vcl::RenderContext& rRenderContext, const tools::Rectangle& _rArea, const StyleSettings& _rStyle) { @@ -362,7 +361,7 @@ namespace svt { namespace table } - void GridTableRenderer::PaintRowHeader(bool /*i_hasControlFocus*/, bool /*_bSelected*/, vcl::RenderContext& rRenderContext, + void GridTableRenderer::PaintRowHeader(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rArea, const StyleSettings& _rStyle) { rRenderContext.Push( PushFlags::LINECOLOR | PushFlags::TEXTCOLOR ); @@ -544,7 +543,7 @@ namespace svt { namespace table } - void GridTableRenderer::HideCellCursor( vcl::Window& _rView, const tools::Rectangle&) + void GridTableRenderer::HideCellCursor( vcl::Window& _rView ) { _rView.HideFocus(); } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 4690c611fb49..7153a8fa7838 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -1195,8 +1195,7 @@ namespace svt { namespace table if (_rUpdateRect.GetIntersection(aCell.getRect()).IsEmpty()) continue; - bool isActiveColumn = (aCell.getColumn() == getCurrentColumn()); - pRenderer->PaintColumnHeader(aCell.getColumn(), isActiveColumn, rRenderContext, aCell.getRect(), rStyle); + pRenderer->PaintColumnHeader(aCell.getColumn(), rRenderContext, aCell.getRect(), rStyle); } } // the area occupied by the row header, if any @@ -1248,7 +1247,7 @@ namespace svt { namespace table if (m_pModel->hasRowHeaders()) { const tools::Rectangle aCurrentRowHeader(aRowHeaderArea.GetIntersection(aRowIterator.getRect())); - pRenderer->PaintRowHeader(isControlFocused, isSelectedRow, rRenderContext, aCurrentRowHeader, rStyle); + pRenderer->PaintRowHeader(rRenderContext, aCurrentRowHeader, rStyle); } if (!colCount) @@ -1660,7 +1659,7 @@ namespace svt { namespace table if ( _bShow ) pRenderer->ShowCellCursor( *m_pDataWindow, aCellRect ); else - pRenderer->HideCellCursor( *m_pDataWindow, aCellRect ); + pRenderer->HideCellCursor( *m_pDataWindow ); } } -- cgit