From caf8bf17ff355d9edb1fe246c480d2f6340f77af Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 17 Oct 2019 12:25:19 +0200 Subject: loplugin:virtualdead unusedparam in LoggedTable::lcl_entry Change-Id: I45c7330b3803f21165714c6140fac46a6592db9b Reviewed-on: https://gerrit.libreoffice.org/80952 Tested-by: Jenkins Reviewed-by: Noel Grandin --- writerfilter/source/dmapper/DomainMapper.cxx | 3 +-- writerfilter/source/dmapper/DomainMapper.hxx | 2 +- writerfilter/source/dmapper/FontTable.cxx | 2 +- writerfilter/source/dmapper/FontTable.hxx | 2 +- writerfilter/source/dmapper/GraphicImport.cxx | 2 +- writerfilter/source/dmapper/GraphicImport.hxx | 2 +- writerfilter/source/dmapper/LoggedResources.cxx | 4 +++- writerfilter/source/dmapper/LoggedResources.hxx | 2 +- writerfilter/source/dmapper/NumberingManager.cxx | 3 +-- writerfilter/source/dmapper/NumberingManager.hxx | 2 +- writerfilter/source/dmapper/SettingsTable.cxx | 2 +- writerfilter/source/dmapper/SettingsTable.hxx | 2 +- writerfilter/source/dmapper/StyleSheetTable.cxx | 2 +- writerfilter/source/dmapper/StyleSheetTable.hxx | 2 +- writerfilter/source/dmapper/ThemeTable.cxx | 2 +- writerfilter/source/dmapper/ThemeTable.hxx | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) (limited to 'writerfilter/source/dmapper') diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 60cd9202b813..e97c41508a8f 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2833,8 +2833,7 @@ void DomainMapper::processDeferredCharacterProperties( const std::map< sal_Int32 } } -void DomainMapper::lcl_entry(int /*pos*/, - writerfilter::Reference::Pointer_t ref) +void DomainMapper::lcl_entry(writerfilter::Reference::Pointer_t ref) { ref->resolve(*this); } diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 72d46e44114e..19c8ebbd942f 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -160,7 +160,7 @@ private: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; void finishParagraph(const bool bRemove = false); diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 4e46878506cf..89bfaaa17c73 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -150,7 +150,7 @@ void FontTable::resolveSprm(Sprm & r_Sprm) pProperties->resolve(*this); } -void FontTable::lcl_entry(int /*pos*/, writerfilter::Reference::Pointer_t ref) +void FontTable::lcl_entry(writerfilter::Reference::Pointer_t ref) { //create a new font entry SAL_WARN_IF( m_pImpl->pCurrentEntry, "writerfilter.dmapper", "current entry has to be NULL here" ); diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 052282b1f090..caf016bd6c18 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -60,7 +60,7 @@ class FontTable : public LoggedProperties, public LoggedTable void resolveSprm(Sprm & r_sprm); // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; // Stream virtual void lcl_startSectionGroup() override; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index d207f609a4f0..0c44a6e8cdf0 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1178,7 +1178,7 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) } } -void GraphicImport::lcl_entry(int /*pos*/, writerfilter::Reference::Pointer_t /*ref*/) +void GraphicImport::lcl_entry(writerfilter::Reference::Pointer_t /*ref*/) { } diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 591bf6bbdd38..a018ad824c97 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -104,7 +104,7 @@ public: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; // Stream virtual void lcl_startSectionGroup() override; diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx index e12aaae36fb3..1278daa8b108 100644 --- a/writerfilter/source/dmapper/LoggedResources.cxx +++ b/writerfilter/source/dmapper/LoggedResources.cxx @@ -387,9 +387,11 @@ void LoggedTable::entry(int pos, writerfilter::Reference::Pointer_t #ifdef DBG_UTIL mHelper.startElement("entry"); LoggedResourcesHelper::attribute("pos", pos); +#else + (void)pos; #endif - lcl_entry(pos, ref); + lcl_entry(ref); #ifdef DBG_UTIL LoggedResourcesHelper::endElement(); diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index e0c693c765f7..a0371f614fd7 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -126,7 +126,7 @@ public: void entry(int pos, writerfilter::Reference::Pointer_t ref) override; protected: - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) = 0; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) = 0; #ifdef DBG_UTIL LoggedResourcesHelper mHelper; diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index af5d2bde6f78..62ca40c99e1a 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -1107,8 +1107,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) } } -void ListsManager::lcl_entry( int /* pos */, - writerfilter::Reference::Pointer_t ref ) +void ListsManager::lcl_entry(writerfilter::Reference::Pointer_t ref ) { if( m_rDMapper.IsOOXMLImport() || m_rDMapper.IsRTFImport() ) { diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx index 10034229b040..4b2083922420 100644 --- a/writerfilter/source/dmapper/NumberingManager.hxx +++ b/writerfilter/source/dmapper/NumberingManager.hxx @@ -224,7 +224,7 @@ private: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; public: diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 337b250ebc20..004ee6431d22 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -559,7 +559,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) } } -void SettingsTable::lcl_entry(int /*pos*/, writerfilter::Reference::Pointer_t ref) +void SettingsTable::lcl_entry(writerfilter::Reference::Pointer_t ref) { ref->resolve(*this); } diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 5fdcb97ac9ee..2b4a49085e20 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -96,7 +96,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; }; typedef tools::SvRef< SettingsTable > SettingsTablePtr; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 05fb9e9b57d9..aec6817c8fd3 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -800,7 +800,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) } -void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference::Pointer_t ref) +void StyleSheetTable::lcl_entry(writerfilter::Reference::Pointer_t ref) { //create a new style entry OSL_ENSURE( !m_pImpl->m_pCurrentEntry, "current entry has to be NULL here"); diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 0fa7d4883c64..0866852c36e6 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -114,7 +114,7 @@ private: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; void applyDefaults(bool bParaProperties); }; diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 68515d1c918e..3764a8a95c54 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -151,7 +151,7 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) #endif } -void ThemeTable::lcl_entry(int /*pos*/, writerfilter::Reference::Pointer_t ref) +void ThemeTable::lcl_entry(writerfilter::Reference::Pointer_t ref) { #ifdef DBG_UTIL TagLogger::getInstance().startElement("ThemeTable.entry"); diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index c85fd29380cf..dda016928833 100644 --- a/writerfilter/source/dmapper/ThemeTable.hxx +++ b/writerfilter/source/dmapper/ThemeTable.hxx @@ -51,7 +51,7 @@ public: virtual void lcl_sprm(Sprm & sprm) override; // Table - virtual void lcl_entry(int pos, writerfilter::Reference::Pointer_t ref) override; + virtual void lcl_entry(writerfilter::Reference::Pointer_t ref) override; // Helper methods static OUString fromLocaleToScriptTag(const OUString& sLocale); -- cgit v1.2.3