diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-12 12:10:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-13 07:48:48 +0100 |
| commit | 719af6a334ecf1a0bbe5a752e5baf553b685e83c (patch) | |
| tree | e9ca262ce2239ef5045c051f1c020fc5368fb827 | |
| parent | 9f066938fb336688658b06652b701905988ae98c (diff) | |
dead flags param in CreateAutoContour
was being used recursively
Change-Id: I2ab920ee62c663f6cdc93ae2ef7eafd142fa0c94
Reviewed-on: https://gerrit.libreoffice.org/46344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svx/contdlg.hxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index fdd59977101d..cf9946c921d3 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -80,8 +80,7 @@ public: const tools::PolyPolygon* pPolyPoly, void* pEditingObj ); static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, - const tools::Rectangle* pRect = nullptr, - const sal_uIntPtr nFlags = 0 ); + const tools::Rectangle* pRect = nullptr ); }; #endif // INCLUDED_SVX_CONTDLG_HXX diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index ee3f962d63c7..692e8face2cd 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -103,8 +103,7 @@ void SvxContourDlg::SetSuperClass( SvxSuperContourDlg& rSuperClass ) } tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, - const tools::Rectangle* pRect, - const sal_uIntPtr nFlags ) + const tools::Rectangle* pRect ) { Bitmap aBmp; XOutFlags nContourFlags = XOutFlags::ContourHorz; @@ -132,7 +131,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, // offset of the sub-image within the total animation aTransMap.SetOrigin( Point( rStepBmp.aPosPix.X(), rStepBmp.aPosPix.Y() ) ); pVDev->SetMapMode( aTransMap ); - pVDev->DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect, nFlags ) ); + pVDev->DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect ) ); } aTransMap.SetOrigin( Point() ); |