diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-02 10:02:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-03 09:06:56 +0200 |
| commit | 60fd81d83a2dbcb64a38910de49f8e2620353702 (patch) | |
| tree | bd4757f6d14f7d422621e202136d0581b0a32e2e /sd | |
| parent | 5233a2c9009533e454a734ac57c764e15f92a229 (diff) | |
loplugin:checkunusedparams in filter
Change-Id: Icdfe9c86b78f28fb79b697e769afe6acb1dbc6f6
Reviewed-on: https://gerrit.libreoffice.org/37139
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f2ce94fe6bca..6ec29c413fdb 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -112,7 +112,6 @@ sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicS if ( !rUniqueId.isEmpty() ) { - ::tools::Rectangle aRect; std::unique_ptr<GraphicObject> xGraphicObject(new GraphicObject(rUniqueId)); Graphic aMappedGraphic, aGraphic(xGraphicObject->GetGraphic()); Size aPrefSize( aGraphic.GetPrefSize() ); @@ -142,7 +141,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicS xGraphicObject.reset(new GraphicObject(aMappedGraphic)); } } - sal_uInt32 nId = pGraphicProv->GetBlibID(aBuExPictureStream, xGraphicObject->GetUniqueID(), aRect); + sal_uInt32 nId = pGraphicProv->GetBlibID(aBuExPictureStream, xGraphicObject->GetUniqueID()); if ( nId && ( nId < 0x10000 ) ) nRetValue = (sal_uInt16)nId - 1; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 3e1e6c454a1a..88c469243d76 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -605,7 +605,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } } @@ -618,7 +618,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::TextInShape, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } @@ -663,14 +663,13 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, nTitleInstance, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, nTitleInstance, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } // outlinerstylesheet sal_uInt16 nLevel; PPTParagraphObj* pParagraphs[ 9 ]; - PPTParagraphObj* pPreviousPara = nullptr; for ( nLevel = 0; nLevel < 9; nLevel++ ) { @@ -685,9 +684,8 @@ bool ImplSdPPTImport::Import() SfxItemSet& rItemSet = pOutlineSheet->GetItemSet(); PPTPortionObj aPortion( *pPPTStyleSheet, nOutlinerInstance, nLevel ); pParagraphs[ nLevel ]->AppendPortion( aPortion ); - pParagraphs[ nLevel ]->ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, pPreviousPara ); + pParagraphs[ nLevel ]->ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); - pPreviousPara = pParagraphs[ nLevel ]; } else pParagraphs[ nLevel ] = nullptr; @@ -702,7 +700,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::Subtitle, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::Subtitle, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } } @@ -715,7 +713,7 @@ bool ImplSdPPTImport::Import() PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::Notes, 0 ); PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::Notes, 0 ); aParagraph.AppendPortion( aPortion ); - aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown, nullptr ); + aParagraph.ApplyTo( rItemSet, oStartNumbering, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); aPortion.ApplyTo( rItemSet, (SdrPowerPointImport&)*this, TSS_Type::Unknown ); } } |