compilerplugins/clang/virtualdead.unusedparams.results | 3 --- writerfilter/source/dmapper/DomainMapper.cxx | 4 ---- writerfilter/source/dmapper/DomainMapper.hxx | 1 - writerfilter/source/dmapper/FontTable.cxx | 4 ---- writerfilter/source/dmapper/FontTable.hxx | 1 - writerfilter/source/dmapper/GraphicImport.cxx | 4 ---- writerfilter/source/dmapper/GraphicImport.hxx | 1 - writerfilter/source/dmapper/LoggedResources.cxx | 4 ++-- writerfilter/source/dmapper/LoggedResources.hxx | 1 - 9 files changed, 2 insertions(+), 21 deletions(-)
New commits: commit 45eeefb064680d4b2af9ed73ce751685d14270a6 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Oct 17 12:30:38 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Oct 17 19:02:54 2019 +0200 loplugin:virtualdead unused param in LoggedStream::lcl_info which means the whole method is actually unused Change-Id: I72d33ab6e260012b82002ceae7ff9e54e2ea6349 Reviewed-on: https://gerrit.libreoffice.org/80953 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index 29f217ae7cae..558aac33656e 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -439,6 +439,3 @@ writerfilter/inc/dmapper/resourcemodel.hxx:173 writerfilter/inc/ooxml/OOXMLDocument.hxx:216 void writerfilter::ooxml::OOXMLDocument::setXNoteType(unsigned int,) 0 -writerfilter/source/dmapper/LoggedResources.hxx:93 - void writerfilter::LoggedStream::lcl_info(const class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > &,) - 0 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index e97c41508a8f..efaaae381beb 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3454,10 +3454,6 @@ void DomainMapper::lcl_substream(Id rName, ::writerfilter::Reference<Stream>::Po m_pImpl->substream(rName, ref); } -void DomainMapper::lcl_info(const std::string & /*info_*/) -{ -} - void DomainMapper::lcl_startGlossaryEntry() { uno::Reference< text::XTextRange > xTextRange = GetCurrentTextRange(); diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index 19c8ebbd942f..c9ef80be2652 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -151,7 +151,6 @@ private: writerfilter::Reference<Table>::Pointer_t ref) override; virtual void lcl_substream(Id name, ::writerfilter::Reference<Stream>::Pointer_t ref) override; - virtual void lcl_info(const std::string & info) override; virtual void lcl_startGlossaryEntry() override; virtual void lcl_endGlossaryEntry() override; diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 89bfaaa17c73..9bd11bdf1474 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -205,10 +205,6 @@ void FontTable::lcl_substream(Id, ::writerfilter::Reference<Stream>::Pointer_t) { } -void FontTable::lcl_info(const std::string& ) -{ -} - void FontTable::lcl_startShape(uno::Reference<drawing::XShape> const&) { } diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index caf016bd6c18..dd45e46c2c34 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -76,7 +76,6 @@ class FontTable : public LoggedProperties, public LoggedTable writerfilter::Reference<Table>::Pointer_t ref) override; virtual void lcl_substream(Id name, ::writerfilter::Reference<Stream>::Pointer_t ref) override; - virtual void lcl_info(const std::string & info) override; virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override; virtual void lcl_endShape( ) override; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 0c44a6e8cdf0..90b82a89c313 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1481,10 +1481,6 @@ void GraphicImport::lcl_substream(Id /*name*/, ::writerfilter::Reference<Stream> { } -void GraphicImport::lcl_info(const std::string& /*info*/) -{ -} - void GraphicImport::lcl_startShape(uno::Reference<drawing::XShape> const&) { } diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index a018ad824c97..a144519690cf 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -119,7 +119,6 @@ public: virtual void lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t ref) override; virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) override; - virtual void lcl_info(const std::string & info) override; virtual void lcl_startShape(css::uno::Reference<css::drawing::XShape> const& xShape) override; virtual void lcl_endShape() override; diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx index 1278daa8b108..ca57c4b0360b 100644 --- a/writerfilter/source/dmapper/LoggedResources.cxx +++ b/writerfilter/source/dmapper/LoggedResources.cxx @@ -289,10 +289,10 @@ void LoggedStream::info(const std::string & _info) #ifdef DBG_UTIL mHelper.startElement("info"); LoggedResourcesHelper::attribute("text", _info); +#else + (void)_info; #endif - lcl_info(_info); - #ifdef DBG_UTIL LoggedResourcesHelper::endElement(); #endif diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx index a0371f614fd7..3177224d4664 100644 --- a/writerfilter/source/dmapper/LoggedResources.hxx +++ b/writerfilter/source/dmapper/LoggedResources.hxx @@ -90,7 +90,6 @@ protected: virtual void lcl_props(writerfilter::Reference<Properties>::Pointer_t ref) = 0; virtual void lcl_table(Id name, writerfilter::Reference<Table>::Pointer_t ref) = 0; virtual void lcl_substream(Id name, writerfilter::Reference<Stream>::Pointer_t ref) = 0; - virtual void lcl_info(const std::string & info) = 0; virtual void lcl_startGlossaryEntry() { } virtual void lcl_endGlossaryEntry() { } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits