diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2022-05-18 21:52:52 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2022-05-19 10:55:06 +0200 |
| commit | 1c25d22bfa072eb78da8930a3877f37a70ff707b (patch) | |
| tree | 50709e859edb0b1c0f31b344b0511959657a656e /include/vcl | |
| parent | d4ab6a4693c0f3147b086173d5a9787f1f0eee34 (diff) | |
Simplify an "ImportGraphic" method by removing useless pExtHeader (WmfExternal)
Change-Id: I2916610e08c3157e0438ec90592fb5b8f921cc24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134574
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Tested-by: Jenkins
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/graphicfilter.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index f1568680660c..0e0351dc4d50 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -314,8 +314,7 @@ public: ErrCode ImportGraphic( Graphic& rGraphic, std::u16string_view rPath, SvStream& rStream, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE, - WmfExternal const *pExtHeader = nullptr ); + sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE ); /// Imports multiple graphics. /// @@ -353,10 +352,9 @@ public: static ErrCode readXBM(SvStream & rStream, Graphic & rGraphic); static ErrCode readXPM(SvStream & rStream, Graphic & rGraphic); - static ErrCode readWMF_EMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, - WmfExternal const* pExtHeader, VectorGraphicDataType eType); - static ErrCode readWMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, WmfExternal const* pExtHeader); - static ErrCode readEMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, WmfExternal const* pExtHeader); + static ErrCode readWMF_EMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType, VectorGraphicDataType eType); + static ErrCode readWMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); + static ErrCode readEMF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); static ErrCode readPDF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); static ErrCode readTIFF(SvStream & rStream, Graphic & rGraphic, GfxLinkType & rLinkType); |