loplugin:checkunusedparams

the "check for taking address of function" part was generating false+

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

4 files changed, 28 insertions, 40 deletions

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 76f9be6b8391..d3c3d7fd6eb6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3195,7 +3195,6 @@ void DomainMapper_Impl::handleAutoNum
 
 void DomainMapper_Impl::handleAuthor
     (OUString const& rFirstParam,
-     uno::Reference< uno::XInterface > & /*xFieldInterface*/,
      uno::Reference< beans::XPropertySet > const& xFieldProperties,
      FieldId  eFieldId )
 {
@@ -3215,8 +3214,7 @@ void DomainMapper_Impl::handleAuthor
     void DomainMapper_Impl::handleDocProperty
         (const FieldContextPtr& pContext,
         OUString const& rFirstParam,
-        uno::Reference< uno::XInterface > & xFieldInterface,
-        uno::Reference< beans::XPropertySet > const&)
+        uno::Reference< uno::XInterface > & xFieldInterface)
 {
     //some docproperties should be imported as document statistic fields, some as DocInfo fields
     //others should be user fields
@@ -3361,8 +3359,6 @@ static uno::Sequence< beans::PropertyValues > lcl_createTOXLevelHyperlinks( bool
 
 void DomainMapper_Impl::handleToc
     (const FieldContextPtr& pContext,
-     uno::Reference< uno::XInterface > & /*xFieldInterface*/,
-     uno::Reference< beans::XPropertySet > const& /*xFieldProperties*/,
     const OUString & sTOCServiceName)
 {
     OUString sValue;
@@ -3627,8 +3623,6 @@ void DomainMapper_Impl::handleBibliography
 
 void DomainMapper_Impl::handleIndex
     (const FieldContextPtr& pContext,
-     uno::Reference< uno::XInterface > & /*xFieldInterface*/,
-     uno::Reference< beans::XPropertySet > const& /*xFieldProperties*/,
     const OUString & sTOCServiceName)
 {
     uno::Reference< beans::XPropertySet > xTOC;
@@ -3802,7 +3796,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                     case FIELD_USERNAME     :
                     case FIELD_USERINITIALS :
                         handleAuthor(sFirstParam,
-                            xFieldInterface, xFieldProperties,
+                            xFieldProperties,
                             aIt->second.eFieldId);
                     break;
                     case FIELD_DATE:
@@ -3852,7 +3846,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                     break;
                     case FIELD_DOCPROPERTY :
                         handleDocProperty(pContext, sFirstParam,
-                                xFieldInterface, xFieldProperties);
+                                xFieldInterface);
                     break;
                     case FIELD_DOCVARIABLE  :
                     {
@@ -4298,7 +4292,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                     case FIELD_USERADDRESS  : //todo: user address collects street, city ...
                     break;
                     case FIELD_INDEX:
-                        handleIndex(pContext, xFieldInterface, xFieldProperties,
+                        handleIndex(pContext,
                                   OUString::createFromAscii(aIt->second.cFieldServiceName));
                         break;
                     case FIELD_BIBLIOGRAPHY:
@@ -4306,7 +4300,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                                   OUString::createFromAscii(aIt->second.cFieldServiceName));
                         break;
                     case FIELD_TOC:
-                        handleToc(pContext, xFieldInterface, xFieldProperties,
+                        handleToc(pContext,
                                   OUString::createFromAscii(aIt->second.cFieldServiceName));
                     break;
                     case FIELD_XE:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index f4fb77625097..3d3296396b13 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -674,23 +674,17 @@ public:
         css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
     static void handleAuthor
         (OUString const& rFirstParam,
-        css::uno::Reference< css::uno::XInterface > & xFieldInterface,
         css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties,
         FieldId eFieldId);
     void handleDocProperty
         (const FieldContextPtr& pContext,
         OUString const& rFirstParam,
-        css::uno::Reference< css::uno::XInterface > & xFieldInterface,
-        css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
+        css::uno::Reference< css::uno::XInterface > & xFieldInterface);
     void handleToc
         (const FieldContextPtr& pContext,
-        css::uno::Reference< css::uno::XInterface > & xFieldInterface,
-        css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties,
         const OUString & sTOCServiceName);
     void handleIndex
         (const FieldContextPtr& pContext,
-        css::uno::Reference< css::uno::XInterface > & xFieldInterface,
-        css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties,
         const OUString & sTOCServiceName);
 
     void handleBibliography
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index 33744b9765e7..c58c8e37411c 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -43,7 +43,7 @@ void LoggedResourcesHelper::startElement(const std::string & sElement)
     TagLogger::getInstance().startElement(msPrefix + "." + sElement);
 }
 
-void LoggedResourcesHelper::endElement(const std::string & /*sElement*/)
+void LoggedResourcesHelper::endElement()
 {
     TagLogger::getInstance().endElement();
 }
@@ -101,7 +101,7 @@ void LoggedStream::endSectionGroup()
     lcl_endSectionGroup();
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("section");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -119,7 +119,7 @@ void LoggedStream::endParagraphGroup()
     lcl_endParagraphGroup();
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("paragraph");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -138,7 +138,7 @@ void LoggedStream::endCharacterGroup()
     lcl_endCharacterGroup();
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("charactergroup");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -156,7 +156,7 @@ void LoggedStream::endShape()
     lcl_endShape();
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("shape");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -169,13 +169,13 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len)
 
     mHelper.startElement("data");
     LoggedResourcesHelper::chars(sText);
-    LoggedResourcesHelper::endElement("data");
+    LoggedResourcesHelper::endElement();
 #endif
 
     lcl_text(data, len);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("text");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -192,13 +192,13 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len)
 
     LoggedResourcesHelper::chars(sText);
 
-    LoggedResourcesHelper::endElement("data");
+    LoggedResourcesHelper::endElement();
 #endif
 
     lcl_utext(data, len);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("utext");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -213,7 +213,7 @@ void LoggedStream::positionOffset(const OUString& rText, bool bVertical)
     lcl_positionOffset(rText, bVertical);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("positionOffset");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -228,7 +228,7 @@ void LoggedStream::align(const OUString& rText, bool bVertical)
     lcl_align(rText, bVertical);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("align");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -242,7 +242,7 @@ void LoggedStream::positivePercentage(const OUString& rText)
     lcl_positivePercentage(rText);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("positivePercentage");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -255,7 +255,7 @@ void LoggedStream::props(writerfilter::Reference<Properties>::Pointer_t ref)
     lcl_props(ref);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("props");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -269,7 +269,7 @@ void LoggedStream::table(Id name, writerfilter::Reference<Table>::Pointer_t ref)
     lcl_table(name, ref);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("table");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -283,7 +283,7 @@ void LoggedStream::substream(Id name, writerfilter::Reference<Stream>::Pointer_t
     lcl_substream(name, ref);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("substream");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -297,7 +297,7 @@ void LoggedStream::info(const std::string & _info)
     lcl_info(_info);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("info");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -310,7 +310,7 @@ void LoggedStream::startGlossaryEntry()
     lcl_startGlossaryEntry();
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("startGlossaryEntry");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -323,7 +323,7 @@ void LoggedStream::endGlossaryEntry()
     lcl_endGlossaryEntry();
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("endGlossaryEntry");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -349,7 +349,7 @@ void LoggedProperties::attribute(Id name, Value & val)
     mHelper.startElement("attribute");
     LoggedResourcesHelper::attribute("name", (*QNameToString::Instance())(name));
     LoggedResourcesHelper::attribute("value", val.toString());
-    LoggedResourcesHelper::endElement("attribute");
+    LoggedResourcesHelper::endElement();
 #endif
 
     lcl_attribute(name, val);
@@ -366,7 +366,7 @@ void LoggedProperties::sprm(Sprm & rSprm)
     lcl_sprm(rSprm);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("sprm");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
@@ -395,7 +395,7 @@ void LoggedTable::entry(int pos, writerfilter::Reference<Properties>::Pointer_t
     lcl_entry(pos, ref);
 
 #ifdef DEBUG_WRITERFILTER
-    LoggedResourcesHelper::endElement("entry");
+    LoggedResourcesHelper::endElement();
 #endif
 }
 
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index c5d59a68a9ec..85569b58e7c4 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -35,7 +35,7 @@ public:
     ~LoggedResourcesHelper();
 
     void startElement(const std::string & sElement);
-    static void endElement(const std::string & sElement);
+    static void endElement();
     static void chars(const OUString & rChars);
     static void chars(const std::string & rChars);
     static void attribute(const std::string & rName, const std::string & rValue);