loplugin:unusedfields

fix the ReturnStmt check

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

10 files changed, 12 insertions, 34 deletions

diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx
index b91aee8dafe9..f0f95e6cee35 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -24,7 +24,7 @@ class CrashReportUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo
                                                    css::frame::XSynchronousDispatch > // => XDispatch!
 {
 public:
-    explicit CrashReportUI(const css::uno::Reference< css::uno::XComponentContext >& xContext);
+    explicit CrashReportUI();
 
     // css.lang.XServiceInfo
 
@@ -37,13 +37,9 @@ public:
 
     virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL,
                                         const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
-
-private:
-    css::uno::Reference< css::uno::XComponentContext > mxContext;
 };
 
-CrashReportUI::CrashReportUI(const css::uno::Reference<css::uno::XComponentContext>& xContext):
-    mxContext(xContext)
+CrashReportUI::CrashReportUI()
 {
 
 }
@@ -77,10 +73,10 @@ css::uno::Any SAL_CALL CrashReportUI::dispatchWithReturnValue(const css::util::U
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
 com_sun_star_comp_svx_CrashReportUI_get_implementation(
-    css::uno::XComponentContext *context,
+    css::uno::XComponentContext */*context*/,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new CrashReportUI(context));
+    return cppu::acquire(new CrashReportUI());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index ce75eacf7991..6c790e52ab79 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -309,7 +309,6 @@ void Svx3DLightControl::Construct2()
 
         // create object for it
         mpLampBottomObject = new E3dPolygonObj(
-            mp3DView->Get3DDefaultAttributes(),
             basegfx::B3DPolyPolygon(a3DCircle));
         mpScene->Insert3DObj( mpLampBottomObject );
 
@@ -323,7 +322,6 @@ void Svx3DLightControl::Construct2()
 
         // create object for it
         mpLampShaftObject = new E3dPolygonObj(
-            mp3DView->Get3DDefaultAttributes(),
             basegfx::B3DPolyPolygon(a3DHalfCircle));
         mpScene->Insert3DObj( mpLampShaftObject );
 
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 4dfe5ba4ea12..6583969bb771 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -36,7 +36,7 @@ sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact()
 
 
 E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& aPos, const basegfx::B3DVector& r3DSize)
-:   E3dCompoundObject(rDefault)
+:   E3dCompoundObject()
 {
     // Set Defaults
     SetDefaultAttributes(rDefault);
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index be2b99b9ac61..c873a30f1f4f 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -56,7 +56,7 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties()
 // surfaces rectangles from the passed PolyPolygon
 
 E3dExtrudeObj::E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth)
-:   E3dCompoundObject(rDefault),
+:   E3dCompoundObject(),
     maExtrudePolygon(rPP)
 {
     // since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 7a6f54efe540..c2fb0f5ac1b1 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -53,7 +53,7 @@ sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties()
 // Constructor from 3D polygon, scale is the conversion factor for the coordinates
 
 E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D)
-:   E3dCompoundObject(rDefault),
+:   E3dCompoundObject(),
     maPolyPoly2D(rPoly2D)
 {
     // since the old class PolyPolygon3D did mirror the given PolyPolygons in Y, do the same here
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index db658f6515a4..c740c9369367 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -749,22 +749,13 @@ E3dCompoundObject::E3dCompoundObject()
     aMaterialAmbientColor()
 {
     // Set defaults
-    E3dDefaultAttributes aDefault;
-    SetDefaultAttributes(aDefault);
+    SetDefaultAttributes();
 }
 
-E3dCompoundObject::E3dCompoundObject(E3dDefaultAttributes& rDefault)
-:   E3dObject(),
-    aMaterialAmbientColor()
-{
-    // Set defaults
-    SetDefaultAttributes(rDefault);
-}
-
-void E3dCompoundObject::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
+void E3dCompoundObject::SetDefaultAttributes()
 {
     // Set defaults
-    aMaterialAmbientColor = rDefault.GetDefaultAmbientColor();
+    aMaterialAmbientColor = COL_BLACK;
 }
 
 E3dCompoundObject::~E3dCompoundObject ()
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index dc41fd66cb6d..190c0ca89ee5 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -34,9 +34,8 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact()
 }
 
 E3dPolygonObj::E3dPolygonObj(
-    E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D)
-:   E3dCompoundObject(rDefault),
+:   E3dCompoundObject(),
     bLineOnly(true)
 {
     // Set geometry
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 4c70359c21ff..ecac05170094 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -51,7 +51,7 @@ sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties()
 // Build Sphere from polygon facets in latitude and longitude
 
 E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize)
-:   E3dCompoundObject(rDefault)
+:   E3dCompoundObject()
 {
     // Set defaults
     SetDefaultAttributes(rDefault);
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 3d54e3aea7f7..4d19f399f470 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -463,10 +463,6 @@ namespace svxform
         Reference< XPropertySet > xSet( pFormData->GetPropertySet() );
         if ( xSet.is() )
             xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList.get() );
-
-        Reference< XContainer >  xContainer( pFormData->GetContainer() );
-        if (xContainer.is())
-            xContainer->removeContainerListener(m_pPropChangeList.get());
     }
 
 
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 469b9edf35be..a089f10f015d 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -233,7 +233,6 @@ public:
 class FmFormData : public FmEntryData
 {
     css::uno::Reference< css::form::XForm >           m_xForm;
-    css::uno::Reference< css::container::XContainer > m_xContainer;
 
 public:
     FmFormData(const css::uno::Reference< css::form::XForm >& _rxForm, FmFormData* _pParent);
@@ -241,7 +240,6 @@ public:
     virtual ~FmFormData() override;
 
     const css::uno::Reference< css::form::XForm >& GetFormIface() const { return m_xForm; }
-    const css::uno::Reference< css::container::XContainer >& GetContainer() const { return m_xContainer; }
 
     virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) override;
     virtual FmEntryData* Clone() override;