From 44bc7fc5609a4930e7236b43cf445920a2a3bc77 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 4 May 2017 12:21:07 +0200 Subject: loplugin:checkunusedparams in svx(part2) Change-Id: I608d504b64336e1cb2fc32a46908bef0cffed3bd Reviewed-on: https://gerrit.libreoffice.org/37229 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 8 ++++---- svx/source/sdr/properties/emptyproperties.cxx | 10 +--------- svx/source/sdr/properties/pageproperties.cxx | 4 ++-- svx/source/sdr/properties/properties.cxx | 5 ----- 4 files changed, 7 insertions(+), 20 deletions(-) (limited to 'svx/source/sdr') diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index a6c3e63ba912..3c33a3ee8e93 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -57,7 +57,7 @@ public: virtual void Invoke() final override; // get primitive visualization - drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo); + drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceForPage(); // Own reaction on changes which will be forwarded to the OC of the owner-VOC virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override; @@ -117,7 +117,7 @@ void PagePrimitiveExtractor::Invoke() } } -drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPrimitive2DSequenceForPage(const DisplayInfo& /*rDisplayInfo*/) +drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPrimitive2DSequenceForPage() { drawinglayer::primitive2d::Primitive2DContainer xRetval; SdrPage* pStartPage = GetStartPage(); @@ -187,7 +187,7 @@ bool PagePrimitiveExtractor::isDrawModeHighContrast() const { return mrViewObjec SdrPageView* PagePrimitiveExtractor::TryToGetSdrPageView() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetSdrPageView(); } OutputDevice* PagePrimitiveExtractor::TryToGetOutputDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetOutputDevice(); } -drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const { drawinglayer::primitive2d::Primitive2DContainer xRetval; const SdrPageObj& rPageObject((static_cast< ViewContactOfPageObj& >(GetViewContact())).GetPageObj()); @@ -255,7 +255,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::crea mpExtractor->SetViewObjectContactRedirector(GetObjectContact().GetViewObjectContactRedirector()); // create page content - xPageContent = mpExtractor->createPrimitive2DSequenceForPage(rDisplayInfo); + xPageContent = mpExtractor->createPrimitive2DSequenceForPage(); // #i105548# reset VOCRedirector to not accidentally have a pointer to a // temporary class, so calls to it are avoided safely diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index d44826f30d07..0eb4b8e0cd8f 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -44,14 +44,6 @@ namespace sdr { } - EmptyProperties::EmptyProperties(const EmptyProperties& rProps, SdrObject& rObj) - : BaseProperties(rProps, rObj), - mpEmptyItemSet(nullptr) - { - // do not gererate an assert, else derivations like PageProperties will generate an assert - // using the Clone() operator path. - } - EmptyProperties::~EmptyProperties() { if(mpEmptyItemSet) @@ -63,7 +55,7 @@ namespace sdr BaseProperties& EmptyProperties::Clone(SdrObject& rObj) const { - return *(new EmptyProperties(*this, rObj)); + return *(new EmptyProperties(rObj)); } const SfxItemSet& EmptyProperties::GetObjectItemSet() const diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 2250aa2156de..f2ac2d192583 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -40,8 +40,8 @@ namespace sdr { } - PageProperties::PageProperties(const PageProperties& rProps, SdrObject& rObj) - : EmptyProperties(rProps, rObj) + PageProperties::PageProperties(const PageProperties& /*rProps*/, SdrObject& rObj) + : EmptyProperties(rObj) { } diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 9c4c8fc3585f..482af2ecdfb9 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -36,11 +36,6 @@ namespace sdr { } - BaseProperties::BaseProperties(const BaseProperties& /*rProps*/, SdrObject& rObj) - : mrObject(rObj) - { - } - BaseProperties::~BaseProperties() { } -- cgit