[Libreoffice-commits] core.git: compilerplugins/clang filter/source include/filter sc/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 21 12:47:57 UTC 2019
compilerplugins/clang/virtualdead.unusedparams.results | 3 ---
filter/source/msfilter/msdffimp.cxx | 4 ++--
filter/source/msfilter/svdfppt.cxx | 2 +-
include/filter/msfilter/msdffimp.hxx | 2 +-
include/filter/msfilter/svdfppt.hxx | 2 +-
sc/source/filter/excel/xiescher.cxx | 2 +-
sc/source/filter/inc/xiescher.hxx | 1 -
7 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit 5968c5b1f785a54fe28ddbc47abd77d4f40c720e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Oct 18 14:15:20 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Oct 21 14:46:37 2019 +0200
loplugin:virtualdead unused param in ProcessClientAnchor2
Change-Id: Ic766fcc1bfd33d891edc1da87e1b35a8efba169a
Reviewed-on: https://gerrit.libreoffice.org/81217
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results
index 3088f9d9f2fa..54e9d3c1f199 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -115,9 +115,6 @@ include/editeng/editeng.hxx:503
include/editeng/svxrtf.hxx:247
void SvxRTFParser::UnknownAttrToken(int,class SfxItemSet *,)
10
-include/filter/msfilter/msdffimp.hxx:506
- void SvxMSDffManager::ProcessClientAnchor2(class SvStream &,class DffRecordHeader &,class SvxMSDffClientData &,struct DffObjData &,)
- 1101
include/filter/msfilter/msdffimp.hxx:546
_Bool SvxMSDffManager::ShapeHasText(unsigned long,unsigned long,)const
00
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index a6651c9d66b8..e0d17f5247ec 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4349,7 +4349,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
aObjData.bClientAnchor = maShapeRecords.SeekToContent( rSt, DFF_msofbtClientAnchor, SEEK_FROM_CURRENT_AND_RESTART );
if ( aObjData.bClientAnchor )
- ProcessClientAnchor2( rSt, *maShapeRecords.Current(), rClientData, aObjData );
+ ProcessClientAnchor2( rSt, *maShapeRecords.Current(), aObjData );
if ( aObjData.bChildAnchor )
aObjData.aBoundRect = aObjData.aChildAnchor;
@@ -6732,7 +6732,7 @@ void SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
}
-void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader& /* rHd */ , SvxMSDffClientData& /* rData */, DffObjData& /* rObj */ )
+void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader& /* rHd */ , DffObjData& /* rObj */ )
{
// will be overridden by SJ in Draw
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index bb47254d46a3..f9da59d7aca7 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -588,7 +588,7 @@ SdrObject* SdrEscherImport::ReadObjText( PPTTextObj* /*pTextObj*/, SdrObject* pO
return pObj;
}
-void SdrEscherImport::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, SvxMSDffClientData& /*rData*/, DffObjData& rObj )
+void SdrEscherImport::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, DffObjData& rObj )
{
sal_Int32 l, t, r, b;
if ( rHd.nRecLen == 16 )
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index a0bc813fd605..856e705c6acd 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -505,7 +505,7 @@ protected:
sal_uInt32& rBuffLen );
virtual void ProcessClientAnchor2( SvStream& rStData,
DffRecordHeader& rHd,
- SvxMSDffClientData& rData, DffObjData& );
+ DffObjData& );
static void ProcessClientData( SvStream& rStData,
sal_uInt32 nDatLen,
std::unique_ptr<char[]>& rpBuff,
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 2720a0612c21..d03bf7488394 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -483,7 +483,7 @@ public:
virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const;
virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, SvxMSDffClientData& rClientData, tools::Rectangle& rTextRect, SdrObject* pObj ) override;
virtual void NotifyFreeObj(SvxMSDffClientData& rData, SdrObject* pObj) override;
- virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, SvxMSDffClientData& rData, DffObjData& rObj ) override;
+ virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, DffObjData& rObj ) override;
void ImportHeaderFooterContainer( DffRecordHeader const & rHeader, HeaderFooterEntry& rEntry );
};
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index cf214285f751..6e6567163ab3 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3536,7 +3536,7 @@ bool XclImpDffConverter::SupportsOleObjects() const
// virtual functions ----------------------------------------------------------
void XclImpDffConverter::ProcessClientAnchor2( SvStream& rDffStrm,
- DffRecordHeader& rHeader, SvxMSDffClientData& /*rClientData*/, DffObjData& rObjData )
+ DffRecordHeader& rHeader, DffObjData& rObjData )
{
// find the OBJ record data related to the processed shape
XclImpDffConvData& rConvData = GetConvData();
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 1d1c42859cb9..8e1e98f759f0 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -957,7 +957,6 @@ private:
virtual void ProcessClientAnchor2(
SvStream& rDffStrm,
DffRecordHeader& rHeader,
- SvxMSDffClientData& rClientData,
DffObjData& rObjData ) override;
/** Processes a DFF object, reads properties from DFF stream. */
virtual SdrObject* ProcessObj(
More information about the Libreoffice-commits
mailing list