diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-07 17:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-08 08:08:35 +0200 |
| commit | a209172669e7a2de6065486e385e4e3007b74bd2 (patch) | |
| tree | 4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /filter | |
| parent | 2675cbf042130f24fe7ea299b85b8f5f4794a667 (diff) | |
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index e49eb2264593..adbd3d41b9a3 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3940,8 +3940,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons { // TODO/LATER: in future probably the correct aspect should be provided here // #i32596# - pass <nCalledByGroup> to method - pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId, 0 ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup, - embed::Aspects::MSOLE_CONTENT ); + pRet = ImportOLE( GetPropertyValue( DFF_Prop_pictureId, 0 ), aGraf, rObjData.aBoundRect, aVisArea, rObjData.nCalledByGroup ); } if( !pRet ) { @@ -6558,8 +6557,7 @@ SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId, const Graphic& rGrf, const tools::Rectangle& rBoundRect, const tools::Rectangle& rVisArea, - const int /* _nCalledByGroup */, - sal_Int64 nAspect ) const + const int /* _nCalledByGroup */ ) const { SdrObject* pRet = nullptr; OUString sStorageName; @@ -6569,7 +6567,7 @@ SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId, if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg )) pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg, rGrf, rBoundRect, rVisArea, pStData, nError, - nSvxMSDffOLEConvFlags, nAspect, maBaseURL); + nSvxMSDffOLEConvFlags, embed::Aspects::MSOLE_CONTENT, maBaseURL); return pRet; } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 748dab777e7d..889e44eefe3d 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1777,8 +1777,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, const Graphic& rGraf, const tools::Rectangle& rBoundRect, const tools::Rectangle& rVisArea, - const int /*_nCalledByGroup*/, - sal_Int64 /*nAspect*/ ) const + const int /*_nCalledByGroup*/ ) const { SdrObject* pRet = nullptr; |