[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang include/sfx2 include/svx sd/source sfx2/source svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 21 06:34:25 UTC 2019
compilerplugins/clang/virtualdead.unusedparams.results | 9 ---------
include/sfx2/emojiviewitem.hxx | 2 +-
include/sfx2/thumbnailviewitem.hxx | 2 +-
include/svx/fmtools.hxx | 2 +-
include/svx/svdhdl.hxx | 2 +-
sd/source/ui/view/viewoverlaymanager.cxx | 4 ++--
sfx2/source/control/emojiviewitem.cxx | 2 +-
sfx2/source/control/thumbnailview.cxx | 4 ++--
sfx2/source/control/thumbnailviewitem.cxx | 2 +-
svx/source/fmcomp/gridctrl.cxx | 2 +-
svx/source/form/fmtools.cxx | 4 ++--
svx/source/svdraw/svdhdl.cxx | 2 +-
svx/source/svdraw/svdmrkv.cxx | 2 +-
13 files changed, 15 insertions(+), 24 deletions(-)
New commits:
commit 4a20922e0eebe9c7a9fe59b3aac8a8d996bee0e7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Oct 18 10:55:51 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 21 08:33:22 2019 +0200
loplugin:virtualdead unused param in ThumbnailViewItem::calculateItemsPosition
Change-Id: I8db99a3672e3603a25ee1f6ca4741a02b73c9516
Reviewed-on: https://gerrit.libreoffice.org/81184
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index 9ed08fc878f6..c216a504b8b7 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -148,9 +148,6 @@ include/sfx2/sidebar/TitleBar.hxx:61
include/sfx2/stbitem.hxx:100
_Bool SfxStatusBarControl::MouseButtonUp(const class MouseEvent &,)
0
-include/sfx2/thumbnailviewitem.hxx:118
- void ThumbnailViewItem::calculateItemsPosition(const long,const long,const long,unsigned int,const struct ThumbnailItemAttributes *,)
- 10111
include/svl/svdde.hxx:228
_Bool DdeGetPutItem::Put(const class DdeData *,)
0
diff --git a/include/sfx2/emojiviewitem.hxx b/include/sfx2/emojiviewitem.hxx
index e0aa57675f9a..0e995664e768 100644
--- a/include/sfx2/emojiviewitem.hxx
+++ b/include/sfx2/emojiviewitem.hxx
@@ -26,7 +26,7 @@ public:
virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs) override;
- virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight,
+ virtual void calculateItemsPosition (const long nThumbnailHeight,
const long nPadding, sal_uInt32 nMaxTextLength,
const ThumbnailItemAttributes *pAttrs) override;
private:
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index 1d001de2469b..a3d1a09b1fb0 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -115,7 +115,7 @@ public:
const tools::Rectangle& getDrawArea () const { return maDrawArea; }
- virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight,
+ virtual void calculateItemsPosition (const long nThumbnailHeight,
const long nPadding, sal_uInt32 nMaxTextLength,
const ThumbnailItemAttributes *pAttrs);
diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx
index f393738d045f..52bbf1d0f2e0 100644
--- a/sfx2/source/control/emojiviewitem.cxx
+++ b/sfx2/source/control/emojiviewitem.cxx
@@ -37,7 +37,7 @@ EmojiViewItem::~EmojiViewItem ()
}
-void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/, const long,
+void EmojiViewItem::calculateItemsPosition (const long /*nThumbnailHeight*/,
const long /*nPadding*/, sal_uInt32 nMaxTextLength,
const ThumbnailItemAttributes *pAttrs)
{
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 9d4225539351..6f4ca606ea1b 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -354,7 +354,7 @@ void ThumbnailView::CalculateItemPositions (bool bScrollBarUsed)
}
pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) ));
- pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get());
+ pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get());
if ( !((nCurCount+1) % mnCols) )
{
@@ -1510,7 +1510,7 @@ void SfxThumbnailView::CalculateItemPositions(bool bScrollBarUsed)
}
pItem->setDrawArea(::tools::Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) ));
- pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get());
+ pItem->calculateItemsPosition(mnThumbnailHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs.get());
if ( !((nCurCount+1) % mnCols) )
{
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index c2957f9ff4bd..930debed6a05 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -120,7 +120,7 @@ void ThumbnailViewItem::setDrawArea (const ::tools::Rectangle &area)
maDrawArea = area;
}
-void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, const long,
+void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight,
const long nPadding, sal_uInt32 nMaxTextLength,
const ThumbnailItemAttributes *pAttrs)
{
commit 2302674d6c884bddf4ea7c42029f0a1465d01d49
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 17 19:53:08 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 21 08:32:53 2019 +0200
loplugin:virtualdead unused param in FmXDisposeListener::disposing
Change-Id: I2189f0a35b03bc8192ab91cd63b210f303f5d3e6
Reviewed-on: https://gerrit.libreoffice.org/81182
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index 5646996b40db..9ed08fc878f6 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -175,9 +175,6 @@ include/svtools/table/tablerenderer.hxx:177
include/svtools/table/tablerenderer.hxx:224
void svt::table::ITableRenderer::HideCellCursor(class vcl::Window &,const class tools::Rectangle &,)
10
-include/svx/fmtools.hxx:141
- void FmXDisposeListener::disposing(const struct com::sun::star::lang::EventObject &,short,)
- 01
include/svx/IAccessibleParent.hxx:80
_Bool accessibility::IAccessibleParent::ReplaceChild(class accessibility::AccessibleShape *,const class com::sun::star::uno::Reference<class com::sun::star::drawing::XShape> &,const long,const class accessibility::AccessibleShapeTreeInfo &,)
1101
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 7a0bb1ca609b..4ed9b7efcf7b 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -138,7 +138,7 @@ public:
virtual ~FmXDisposeListener();
/// @throws css::uno::RuntimeException
- virtual void disposing(const css::lang::EventObject& _rEvent, sal_Int16 _nId) = 0;
+ virtual void disposing(sal_Int16 _nId) = 0;
protected:
void setAdapter(FmXDisposeMultiplexer* pAdapter);
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 0c3a7ce185dc..8ffe69bc6f48 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -203,7 +203,7 @@ public:
DisposeListenerGridBridge( DbGridControl& _rParent, const Reference< XComponent >& _rxObject);
virtual ~DisposeListenerGridBridge() override;
- virtual void disposing(const EventObject& /*_rEvent*/, sal_Int16 _nId) override { m_rParent.disposing(_nId); }
+ virtual void disposing(sal_Int16 _nId) override { m_rParent.disposing(_nId); }
};
DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject)
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index c277a4b06925..6297a3d0e69f 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -298,13 +298,13 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer()
// css::lang::XEventListener
-void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source)
+void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& /*Source*/)
{
Reference< css::lang::XEventListener> xPreventDelete(this);
if (m_pListener)
{
- m_pListener->disposing(Source, 0);
+ m_pListener->disposing(0);
m_pListener->setAdapter(nullptr);
m_pListener = nullptr;
}
commit defd2cb0255ad9e376ccd18df9a48ed1adae9d1e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 17 16:47:45 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 21 08:32:39 2019 +0200
loplugin:virtualdead unused param in SdrHdl::onHelpRequest
Change-Id: I3d75755bd6fd7f3168725c53fd8ce571a938fa37
Reviewed-on: https://gerrit.libreoffice.org/81181
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index 08ae23369b67..5646996b40db 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -184,9 +184,6 @@ include/svx/IAccessibleParent.hxx:80
include/svx/selectioncontroller.hxx:48
_Bool sdr::SelectionController::onMouseButtonUp(const class MouseEvent &,class vcl::Window *,)
10
-include/svx/svdhdl.hxx:242
- void SdrHdl::onHelpRequest(const class HelpEvent &,)
- 0
include/vcl/accessibletable.hxx:91
class tools::Rectangle vcl::table::IAccessibleTable::GetFieldCharacterBounds(int,int,int,)
001
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index a96e63b4ed6b..29d72620ada9 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -239,7 +239,7 @@ public:
virtual void onMouseEnter(const MouseEvent& rMEvt);
/** is called when help is requested for the area of this handle */
- virtual void onHelpRequest(const HelpEvent& rHEvt);
+ virtual void onHelpRequest();
/** is called when the mouse leaves the area of this handle. If the handle changes his
visualisation during mouse over it must override this method and call Touch(). */
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index dd5dc860c33f..8b5814749529 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -139,7 +139,7 @@ public:
virtual PointerStyle GetPointer() const override;
virtual void onMouseEnter(const MouseEvent& rMEvt) override;
- virtual void onHelpRequest(const HelpEvent& rHEvt) override;
+ virtual void onHelpRequest() override;
virtual void onMouseLeave() override;
int getHighlightId() const { return mnHighlightId; }
@@ -196,7 +196,7 @@ void ImageButtonHdl::ShowTip()
Help::ShowQuickHelp(pWindow, aScreenRect, aHelpText);
}
-void ImageButtonHdl::onHelpRequest(const HelpEvent& /*rHEvt*/)
+void ImageButtonHdl::onHelpRequest()
{
ShowTip();
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 69ac684925af..7bbd56293a0d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1064,7 +1064,7 @@ void SdrHdl::onMouseEnter(const MouseEvent& /*rMEvt*/)
{
}
-void SdrHdl::onHelpRequest(const HelpEvent& /*rHEvt*/)
+void SdrHdl::onHelpRequest()
{
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 0a3f5052d437..c012cc0fb10e 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1449,7 +1449,7 @@ bool SdrMarkView::RequestHelp(const HelpEvent& rHEvt)
SdrHdl* pCurrentHdl = GetHdl(nHdl);
if (pCurrentHdl->mbMouseOver)
{
- pCurrentHdl->onHelpRequest(rHEvt);
+ pCurrentHdl->onHelpRequest();
return true;
}
}
More information about the Libreoffice-commits
mailing list