loplugin:checkunusedparams in package..reportdesign

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

6 files changed, 25 insertions, 22 deletions

diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 8a5adae887ee..637a1f56eed1 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -300,7 +300,13 @@ void OGroup::setSection(     const OUString& _sProperty
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         prepareSet(_sProperty, uno::makeAny(_member), uno::makeAny(_bOn), &l);
-        lcl_createSectionIfNeeded(_bOn ,this,_member);
+
+        // create section if needed
+        if ( _bOn && !_member.is() )
+            _member = OSection::createOSection(this, getContext());
+        else if ( !_bOn )
+            ::comphelper::disposeComponent(_member);
+
         if ( _member.is() )
             _member->setName(_sName);
     }
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 6d71b73c5c59..620951d2088e 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1034,7 +1034,13 @@ void OReportDefinition::setSection(  const OUString& _sProperty
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         prepareSet(_sProperty, uno::makeAny(_member), uno::makeAny(_bOn), &l);
-        lcl_createSectionIfNeeded(_bOn ,this,_member,_sProperty == PROPERTY_PAGEHEADERON || _sProperty == PROPERTY_PAGEFOOTERON);
+
+        // create section if needed
+        if ( _bOn && !_member.is() )
+            _member = OSection::createOSection(this, getContext(), _sProperty == PROPERTY_PAGEHEADERON || _sProperty == PROPERTY_PAGEFOOTERON);
+        else if ( !_bOn )
+            ::comphelper::disposeComponent(_member);
+
         if ( _member.is() )
             _member->setName(_sName);
     }
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 24deb203928c..548a38748733 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -95,8 +95,7 @@ uno::Reference<report::XSection> OSection::createOSection(
 
 uno::Reference<report::XSection> OSection::createOSection(
     const uno::Reference< report::XGroup >& xParentGroup,
-    const uno::Reference< uno::XComponentContext >& context,
-    bool const)
+    const uno::Reference< uno::XComponentContext >& context)
 {
     OSection *const pNew =
         new OSection(nullptr, xParentGroup, context, lcl_getGroupAbsent());
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 2ce22531c13d..d2430820953c 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -139,7 +139,7 @@ namespace reportdesign
                 ,const css::uno::Reference< css::uno::XComponentContext >& context,bool _bPageSection=false);
         static css::uno::Reference< css::report::XSection>
         createOSection(const css::uno::Reference< css::report::XGroup >& _xParent
-                ,const css::uno::Reference< css::uno::XComponentContext >& context, bool _bPageSection);
+                ,const css::uno::Reference< css::uno::XComponentContext >& context);
 
         DECLARE_XINTERFACE( )
 
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 98f6185fb460..99fb0211b9e9 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -35,14 +35,6 @@
 
 namespace reportdesign
 {
-    template <class T> void lcl_createSectionIfNeeded(bool _bOn,const T& _xParent,css::uno::Reference< css::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false)
-    {
-        if ( _bOn && !_xSection.is() )
-            _xSection = OSection::createOSection(_xParent,_xParent->getContext(),_bPageSection);
-        else if ( !_bOn )
-            ::comphelper::disposeComponent(_xSection);
-    }
-
     /** uses the XChild interface to get the section from any child of it.
      *
      * \param _xReportComponent A report component which is a child of the section.
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 45b5dc064d30..b3dd2f550f2d 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -365,7 +365,7 @@ void OObjectBase::StartListening()
     }
 }
 
-void OObjectBase::EndListening(bool /*bRemoveListener*/)
+void OObjectBase::EndListening()
 {
     OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!");
 
@@ -663,7 +663,7 @@ void OUnoObject::NbcMove( const Size& rSize )
     if ( m_bIsListening )
     {
         // stop listening
-        OObjectBase::EndListening(false);
+        OObjectBase::EndListening();
 
         bool bPositionFixed = false;
         Size aUndoSize(0,0);
@@ -710,7 +710,7 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac
     SdrUnoObj::NbcResize( rRef, xFract, yFract );
 
     // stop listening
-    OObjectBase::EndListening(false);
+    OObjectBase::EndListening();
 
     // set geometry properties
     SetPropsFromRect(GetLogicRect());
@@ -723,7 +723,7 @@ void OUnoObject::NbcSetLogicRect(const tools::Rectangle& rRect)
 {
     SdrUnoObj::NbcSetLogicRect(rRect);
     // stop listening
-    OObjectBase::EndListening(false);
+    OObjectBase::EndListening();
 
     // set geometry properties
     SetPropsFromRect(rRect);
@@ -796,7 +796,7 @@ void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt )
             Reference<XPropertySet> xControlModel(GetUnoControlModel(),uno::UNO_QUERY);
             if ( xControlModel.is() )
             {
-                OObjectBase::EndListening(false);
+                OObjectBase::EndListening();
                 try
                 {
                     xControlModel->setPropertyValue(PROPERTY_TEXTCOLOR,evt.NewValue);
@@ -823,7 +823,7 @@ void OUnoObject::_propertyChange( const  beans::PropertyChangeEvent& evt )
                 if ( !aNewName.equals(aOldName) )
                 {
                     // set old name property
-                    OObjectBase::EndListening(false);
+                    OObjectBase::EndListening();
                     if ( m_xMediator.is() )
                         m_xMediator.get()->stopListening();
                     try
@@ -938,7 +938,7 @@ void OOle2Obj::NbcMove( const Size& rSize )
     if ( m_bIsListening )
     {
         // stop listening
-        OObjectBase::EndListening(false);
+        OObjectBase::EndListening();
 
         bool bPositionFixed = false;
         Size aUndoSize(0,0);
@@ -990,7 +990,7 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
     SdrOle2Obj::NbcResize( rRef, xFract, yFract );
 
     // stop listening
-    OObjectBase::EndListening(false);
+    OObjectBase::EndListening();
 
     // set geometry properties
     SetPropsFromRect(GetLogicRect());
@@ -1003,7 +1003,7 @@ void OOle2Obj::NbcSetLogicRect(const tools::Rectangle& rRect)
 {
     SdrOle2Obj::NbcSetLogicRect(rRect);
     // stop listening
-    OObjectBase::EndListening(false);
+    OObjectBase::EndListening();
 
     // set geometry properties
     SetPropsFromRect(rRect);