Kaydet (Commit) 719af6a3 authored tarafından Noel Grandin's avatar Noel Grandin

dead flags param in CreateAutoContour

was being used recursively

Change-Id: I2ab920ee62c663f6cdc93ae2ef7eafd142fa0c94
Reviewed-on: https://gerrit.libreoffice.org/46344Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9f066938
...@@ -80,8 +80,7 @@ public: ...@@ -80,8 +80,7 @@ public:
const tools::PolyPolygon* pPolyPoly, void* pEditingObj ); const tools::PolyPolygon* pPolyPoly, void* pEditingObj );
static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic, static tools::PolyPolygon CreateAutoContour( const Graphic& rGraphic,
const tools::Rectangle* pRect = nullptr, const tools::Rectangle* pRect = nullptr );
const sal_uIntPtr nFlags = 0 );
}; };
#endif // INCLUDED_SVX_CONTDLG_HXX #endif // INCLUDED_SVX_CONTDLG_HXX
......
...@@ -103,8 +103,7 @@ void SvxContourDlg::SetSuperClass( SvxSuperContourDlg& rSuperClass ) ...@@ -103,8 +103,7 @@ void SvxContourDlg::SetSuperClass( SvxSuperContourDlg& rSuperClass )
} }
tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
const tools::Rectangle* pRect, const tools::Rectangle* pRect )
const sal_uIntPtr nFlags )
{ {
Bitmap aBmp; Bitmap aBmp;
XOutFlags nContourFlags = XOutFlags::ContourHorz; XOutFlags nContourFlags = XOutFlags::ContourHorz;
...@@ -132,7 +131,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, ...@@ -132,7 +131,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
// offset of the sub-image within the total animation // offset of the sub-image within the total animation
aTransMap.SetOrigin( Point( rStepBmp.aPosPix.X(), rStepBmp.aPosPix.Y() ) ); aTransMap.SetOrigin( Point( rStepBmp.aPosPix.X(), rStepBmp.aPosPix.Y() ) );
pVDev->SetMapMode( aTransMap ); pVDev->SetMapMode( aTransMap );
pVDev->DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect, nFlags ) ); pVDev->DrawPolyPolygon( CreateAutoContour( rStepBmp.aBmpEx, pRect ) );
} }
aTransMap.SetOrigin( Point() ); aTransMap.SetOrigin( Point() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment