[Libreoffice-commits] core.git: compilerplugins/clang filter/source include/filter sc/source
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
AuthorDate: Fri Oct 18 14:15:20 2019 +0200
Commit: Noel Grandin
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
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& 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 voidNotifyFreeObj(SvxMSDffClientData& rData, SdrObject*
pObj) override;
-virtual voidProcessClientAnchor2( SvStream& rSt, DffRecordHeader&
rHd, SvxMSDffClientData& rData, DffObjData& rObj ) overrid
[Libreoffice-commits] core.git: compilerplugins/clang filter/source include/filter
compilerplugins/clang/mergeclasses.results |1
filter/source/msfilter/escherex.cxx|4 +-
filter/source/msfilter/eschesdo.cxx| 49 --
filter/source/msfilter/eschesdo.hxx| 53 +++--
include/filter/msfilter/escherex.hxx |8 ++--
5 files changed, 42 insertions(+), 73 deletions(-)
New commits:
commit a7e395f3975a326a278eb99dbabb0030e4335009
Author: Noel Grandin
Date: Thu Oct 13 13:30:27 2016 +0200
loplugin:mergeclasses ImplEESdrWriter with ImplEscherExSdr
Change-Id: Iea2241d9fc44b92e18101b3f367a643f03729183
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index d0c51a5..428bd40 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -71,7 +71,6 @@ merge IXFAttrList with XFSaxAttrList
merge IXFStream with XFSaxStream
merge IXFStyle with XFStyle
merge IconChoicePage with SvxHyperlinkTabPageBase
-merge ImplEESdrWriter with ImplEscherExSdr
merge ImplGlyphFallbackFontSubstitution with FcGlyphFallbackSubstitution
merge ImplPreMatchFontSubstitution with FcPreMatchSubstitution
merge LwpDLList with LwpParaProperty
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index da6a5cf..ff78d89 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4975,7 +4975,7 @@ EscherEx::EscherEx(const std::shared_ptr&
rxGlobal, SvStream* pO
mbOwnsStrm = true;
}
mnStrmStartOfs = mpOutStrm->Tell();
-mpImplEscherExSdr.reset( new ImplEscherExSdr( *this ) );
+mpImplEESdrWriter.reset( new ImplEESdrWriter( *this ) );
}
EscherEx::~EscherEx()
@@ -5295,7 +5295,7 @@ sal_uInt32 EscherEx::EnterGroup( const OUString&
rShapeName, const Rectangle* pB
if ( mnGroupLevel > 1 )
AddChildAnchor( aRect );
-EscherExHostAppData* pAppData = mpImplEscherExSdr->ImplGetHostData();
+EscherExHostAppData* pAppData = mpImplEESdrWriter->ImplGetHostData();
if( pAppData )
{
if ( mnGroupLevel <= 1 )
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index 010fadf..5b9028d 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -69,9 +69,13 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
, mpPicStrm(nullptr)
, mpHostAppData(nullptr)
, mbIsTitlePossible(false)
+, mpSdrPage( nullptr )
+, mpSolverContainer( nullptr )
{
}
+
+
Point ImplEESdrWriter::ImplMapPoint( const Point& rPoint )
{
return OutputDevice::LogicToLogic( rPoint, maMapModeSrc, maMapModeDest );
@@ -833,18 +837,9 @@ void ImplEESdrWriter::ImplWritePage(
}
}
-ImplEscherExSdr::ImplEscherExSdr( EscherEx& rEx )
-:
-ImplEESdrWriter( rEx ),
-mpSdrPage( nullptr ),
-mpSolverContainer( nullptr )
+ImplEESdrWriter::~ImplEESdrWriter()
{
-}
-
-
-ImplEscherExSdr::~ImplEscherExSdr()
-{
-DBG_ASSERT( !mpSolverContainer, "ImplEscherExSdr::~ImplEscherExSdr:
unwritten SolverContainer" );
+DBG_ASSERT( !mpSolverContainer, "ImplEESdrWriter::~ImplEESdrWriter:
unwritten SolverContainer" );
Reference xComp(mXDrawPage, UNO_QUERY);
if (xComp.is())
xComp->dispose();
@@ -852,7 +847,7 @@ ImplEscherExSdr::~ImplEscherExSdr()
}
-bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage )
+bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
{
SvxDrawPage* pSvxDrawPage;
if ( mpSdrPage != &rPage || !mXDrawPage.is() )
@@ -880,7 +875,7 @@ bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage )
return pSvxDrawPage != nullptr;
}
-bool ImplEscherExSdr::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
+bool ImplEESdrWriter::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
{
// eventually write SolverContainer of current page, deletes the Solver
ImplFlushSolverContainer();
@@ -899,7 +894,7 @@ bool ImplEscherExSdr::ImplInitUnoShapes( const Reference<
XShapes >& rxShapes )
return true;
}
-void ImplEscherExSdr::ImplExitPage()
+void ImplEESdrWriter::ImplExitPage()
{
// close all groups before the solver container is written
while( mpEscherEx->GetGroupLevel() )
@@ -910,7 +905,7 @@ void ImplEscherExSdr::ImplExitPage()
}
-void ImplEscherExSdr::ImplFlushSolverContainer()
+void ImplEESdrWriter::ImplFlushSolverContainer()
{
if ( mpSolverContainer )
{
@@ -920,43 +915,43 @@ void ImplEscherExSdr::ImplFlushSolverContainer()
}
}
-void ImplEscherExSdr::ImplWriteCurrentPage()
+void ImplEESdrWriter::ImplWriteCurrentPage()
{
-assert(mpSolverContainer && "ImplEscherExSdr::ImplWriteCurrentPage: no
SolverContainer");
+assert(mpSolverContainer && "ImplEESdrWriter::ImplWriteCurrentPage: no
SolverContainer");
ImplWritePage( *mpSolverContainer );
ImplExitPage();
}
-sal_uInt32 Imp
