[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sc/source sd/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Oct 19 06:00:00 UTC 2019
compilerplugins/clang/virtualdead.unusedparams.results | 6 ------
sc/source/ui/vba/vbarange.cxx | 12 ++++++------
sc/source/ui/vba/vbarange.hxx | 2 +-
sd/source/ui/inc/OutlineView.hxx | 2 --
sd/source/ui/inc/View.hxx | 2 --
sd/source/ui/view/drviews1.cxx | 4 ++--
sd/source/ui/view/outlview.cxx | 2 +-
sd/source/ui/view/sdview2.cxx | 2 +-
sd/source/ui/view/viewshe2.cxx | 6 +++---
9 files changed, 14 insertions(+), 24 deletions(-)
New commits:
commit b98cb40d974d40d131b6b25f96e9c53890154296
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 17 15:42:13 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Oct 19 07:59:26 2019 +0200
loplugin:virtualdead unused param in ValueGetter::processValue
Change-Id: Id2b514b0892f8d7cf93fe3c5884e8d89a6f0a7b1
Reviewed-on: https://gerrit.libreoffice.org/81076
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 ef8a78956ccb..3ac03d4acaa3 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -238,9 +238,6 @@ sc/inc/formulagroup.hxx:145
sc/source/core/opencl/formulagroupcl.cxx:1059
void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream<char> &,)
0
-sc/source/ui/vba/vbarange.hxx:68
- void ValueGetter::processValue(int,int,const class com::sun::star::uno::Any &,)
- 001
sdext/source/pdfimport/inc/contentsink.hxx:150
void pdfi::ContentSink::drawMask(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool,)
10
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index f3b5480e1420..311cb9c1fc22 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -772,17 +772,17 @@ protected:
public:
CellValueGetter() {}
virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override;
- virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) override;
+ virtual void processValue( const uno::Any& aValue ) override;
const uno::Any& getValue() const override { return maValue; }
};
void
-CellValueGetter::processValue( sal_Int32 /*x*/, sal_Int32 /*y*/, const uno::Any& aValue )
+CellValueGetter::processValue( const uno::Any& aValue )
{
maValue = aValue;
}
-void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell )
+void CellValueGetter::visitNode( sal_Int32 /*x*/, sal_Int32 /*y*/, const uno::Reference< table::XCell >& xCell )
{
uno::Any aValue;
table::CellContentType eType = xCell->getType();
@@ -830,7 +830,7 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference<
uno::Reference< text::XTextRange > xTextRange(xCell, ::uno::UNO_QUERY_THROW);
aValue <<= xTextRange->getString();
}
- processValue( x,y,aValue );
+ processValue( aValue );
}
class CellFormulaValueSetter : public CellValueSetter
@@ -889,7 +889,7 @@ private:
formula::FormulaGrammar::Grammar const m_eGrammar;
public:
CellFormulaValueGetter(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {}
- virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) override
+ virtual void visitNode( sal_Int32 /*x*/, sal_Int32 /*y*/, const uno::Reference< table::XCell >& xCell ) override
{
uno::Any aValue;
aValue <<= xCell->getFormula();
@@ -911,7 +911,7 @@ public:
aValue <<= sVal;
}
- processValue( x,y,aValue );
+ processValue( aValue );
}
};
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index 7a9b1b21b1d8..9cc7f6ded196 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -65,7 +65,7 @@ class ValueGetter : public ArrayVisitor
{
public:
- virtual void processValue( sal_Int32 x, sal_Int32 y, const css::uno::Any& aValue ) = 0;
+ virtual void processValue( const css::uno::Any& aValue ) = 0;
virtual const css::uno::Any& getValue() const = 0;
};
commit 0d416965a64f30b811891ba977e58542dcfb2d4f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Oct 17 15:25:52 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Oct 19 07:59:11 2019 +0200
loplugin:virtualdead unused param in sd::View::AcceptDrop
Change-Id: I51aceb8a1f908cf89a0b8b6d0e58755fc4374862
Reviewed-on: https://gerrit.libreoffice.org/81075
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 d8d9c708c7d9..ef8a78956ccb 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -241,9 +241,6 @@ sc/source/core/opencl/formulagroupcl.cxx:1059
sc/source/ui/vba/vbarange.hxx:68
void ValueGetter::processValue(int,int,const class com::sun::star::uno::Any &,)
001
-sd/source/ui/inc/View.hxx:92
- signed char sd::View::AcceptDrop(const struct AcceptDropEvent &,class DropTargetHelper &,class sd::Window *,unsigned short,struct o3tl::strong_int<unsigned char, struct SdrLayerIDTag>,)
- 11001
sdext/source/pdfimport/inc/contentsink.hxx:150
void pdfi::ContentSink::drawMask(const class com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue> &,_Bool,)
10
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 67d7647b8d5e..4742f67f5bb3 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -123,8 +123,6 @@ public:
virtual sal_Int8 AcceptDrop (
const AcceptDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow,
- sal_uInt16 nPage,
SdrLayerID nLayer) override;
virtual sal_Int8 ExecuteDrop (
const ExecuteDropEvent& rEvt,
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 119c7848424c..5aba1fb326d9 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -92,8 +92,6 @@ public:
virtual sal_Int8 AcceptDrop (
const AcceptDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow,
- sal_uInt16 nPage,
SdrLayerID nLayer);
virtual sal_Int8 ExecuteDrop (
const ExecuteDropEvent& rEvt,
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index cf6c62c5bea0..e41f34a19774 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1282,7 +1282,7 @@ void DrawViewShell::ResetActualLayer()
sal_Int8 DrawViewShell::AcceptDrop (
const AcceptDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow,
+ ::sd::Window* /*pTargetWindow*/,
sal_uInt16 nPage,
SdrLayerID nLayer )
{
@@ -1292,7 +1292,7 @@ sal_Int8 DrawViewShell::AcceptDrop (
if( SlideShow::IsRunning( GetViewShellBase() ) )
return DND_ACTION_NONE;
- return mpDrawView->AcceptDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer );
+ return mpDrawView->AcceptDrop( rEvt, rTargetHelper, nLayer );
}
/**
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 67605076550d..a9b7771074c9 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1304,7 +1304,7 @@ void OutlineView::ResetLinks() const
mrOutliner.SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
}
-sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, ::sd::Window*, sal_uInt16, SdrLayerID)
+sal_Int8 OutlineView::AcceptDrop( const AcceptDropEvent&, DropTargetHelper&, SdrLayerID)
{
return DND_ACTION_NONE;
}
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index da69acdad1a1..ef22fde0f15b 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -421,7 +421,7 @@ void View::DragFinished( sal_Int8 nDropAction )
}
sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper,
- ::sd::Window*, sal_uInt16, SdrLayerID nLayer )
+ SdrLayerID nLayer )
{
OUString aLayerName = GetActiveLayer();
SdrPageView* pPV = GetSdrPageView();
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 0341c104db7c..9ce31a6cba29 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -866,12 +866,12 @@ void ViewShell::SetScrollBarsVisible(bool bVisible)
sal_Int8 ViewShell::AcceptDrop (
const AcceptDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
- ::sd::Window* pTargetWindow,
- sal_uInt16 nPage,
+ ::sd::Window* /*pTargetWindow*/,
+ sal_uInt16 /*nPage*/,
SdrLayerID nLayer)
{
::sd::View* pView = GetView();
- return( pView ? pView->AcceptDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE );
+ return( pView ? pView->AcceptDrop( rEvt, rTargetHelper, nLayer ) : DND_ACTION_NONE );
}
sal_Int8 ViewShell::ExecuteDrop (
More information about the Libreoffice-commits
mailing list