compilerplugins/clang/virtualdead.unusedparams.results | 3 --- sw/source/filter/xml/xmlexpit.cxx | 14 +++----------- sw/source/filter/xml/xmlexpit.hxx | 10 ++-------- sw/source/filter/xml/xmliteme.cxx | 12 ++---------- 4 files changed, 7 insertions(+), 32 deletions(-)
New commits: commit ecfc3689320798e75f0836974ef917a6b83ad535 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Oct 17 13:17:12 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Oct 18 09:40:22 2019 +0200 loplugin:virtualdead unused params in SvXMLExportItemMapper::handleElementItem Change-Id: Ib77a29d23d8a67fab8441d369b2ff4660c1f99bc Reviewed-on: https://gerrit.libreoffice.org/81009 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 73274db75fc5..1f333031f148 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -340,9 +340,6 @@ sw/source/filter/ww8/wrtww8.hxx:798 sw/source/filter/ww8/wrtww8.hxx:863 void MSWordExportBase::OutputGrfNode(const class SwGrfNode &,) 0 -sw/source/filter/xml/xmlexpit.hxx:84 - void SvXMLExportItemMapper::handleElementItem(class SvXMLExport &,const struct SvXMLItemMapEntry &,const class SfxPoolItem &,const class SvXMLUnitConverter &,const class SfxItemSet &,enum SvXmlExportFlags,)const - 011000 vcl/inc/outdev.h:122 _Bool ImplGlyphFallbackFontSubstitution::FindFontSubstitute(class FontSelectPattern &,class LogicalFontInstance *,class rtl::OUString &,)const 101 diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 8b09189ba403..0fc88cbba90d 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -239,9 +239,7 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, void SvXMLExportItemMapper::exportElementItems( SvXMLExport& rExport, - const SvXMLUnitConverter& rUnitConverter, const SfxItemSet &rSet, - SvXmlExportFlags nFlags, const std::vector<sal_uInt16> &rIndexArray ) const { const size_t nCount = rIndexArray.size(); @@ -259,8 +257,7 @@ void SvXMLExportItemMapper::exportElementItems( if(pItem) { rExport.IgnorableWhitespace(); - handleElementItem( rExport, rEntry, *pItem, rUnitConverter, - rSet, nFlags); + handleElementItem( rEntry, *pItem ); bItemsExported = true; } } @@ -314,8 +311,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, ePropToken, false, false ); - exportElementItems( rExport, rUnitConverter, - rSet, SvXmlExportFlags::IGN_WS, aIndexArray ); + exportElementItems( rExport, rSet, aIndexArray ); } } @@ -334,12 +330,8 @@ void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& /*rAttrList*/ /** this method is called for every item that has the MID_SW_FLAG_ELEMENT_EXPORT flag set */ void SvXMLExportItemMapper::handleElementItem( - SvXMLExport& /*rExport*/, const SvXMLItemMapEntry& /*rEntry*/, - const SfxPoolItem& /*rItem*/, - const SvXMLUnitConverter& /*rUnitConverter*/, - const SfxItemSet& /*rSet*/, - SvXmlExportFlags /*nFlags*/ ) const + const SfxPoolItem& /*rItem*/ ) const { OSL_FAIL( "element item not handled in xml export" ); } diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index f3f07c33c351..7639dd063c65 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -53,9 +53,7 @@ protected: const SfxItemSet *pSet ) const; void exportElementItems( SvXMLExport& rExport, - const SvXMLUnitConverter& rUnitConverter, const SfxItemSet &rSet, - SvXmlExportFlags nFlags, const std::vector<sal_uInt16> &rIndexArray ) const; static const SfxPoolItem* GetItem( const SfxItemSet &rSet, @@ -81,12 +79,8 @@ public: /** this method is called for every item that has the MID_SW_FLAG_ELEMENT_EXPORT flag set */ - virtual void handleElementItem( SvXMLExport& rExport, - const SvXMLItemMapEntry& rEntry, - const SfxPoolItem& rItem, - const SvXMLUnitConverter& rUnitConverter, - const SfxItemSet& rSet, - SvXmlExportFlags nFlags ) const; + virtual void handleElementItem( const SvXMLItemMapEntry& rEntry, + const SfxPoolItem& rItem ) const; inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 7ba4db9501d2..b307a5c10872 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -73,12 +73,8 @@ public: const SfxItemSet *pSet ) const override; virtual void handleElementItem( - SvXMLExport& rExport, const SvXMLItemMapEntry& rEntry, - const SfxPoolItem& rItem, - const SvXMLUnitConverter& rUnitConverter, - const SfxItemSet& rSet, - SvXmlExportFlags nFlags ) const override; + const SfxPoolItem& rItem ) const override; inline void SetAbsWidth( sal_uInt32 nAbs ); }; @@ -182,12 +178,8 @@ void SwXMLTableItemMapper_Impl::handleSpecialItem( /** this method is called for every item that has the MID_SW_FLAG_ELEMENT_EXPORT flag set */ void SwXMLTableItemMapper_Impl::handleElementItem( - SvXMLExport& /*rExport*/, const SvXMLItemMapEntry& rEntry, - const SfxPoolItem& rItem, - const SvXMLUnitConverter& /*rUnitConverter*/, - const SfxItemSet&, - SvXmlExportFlags ) const + const SfxPoolItem& rItem ) const { switch( rEntry.nWhichId ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits