diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:47:37 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:40 -0500 |
| commit | 448a931f776f2d4e4ca2e44c49f830653af7efbc (patch) | |
| tree | 4ece62bffc3f83d6fb963ef75a1b45e224b440a4 /oox | |
| parent | dcbad5d45e9c658766f9b165020db8fb612d4f6e (diff) | |
convert PolyFlags to scoped enum
and remove the XPolyFlags enum, which has the same values and was being
converted to PolyFlags anyhow
Change-Id: Iaead84933c79a7603698a4e50257dd944df89c41
Reviewed-on: https://gerrit.libreoffice.org/31627
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit a08cb3b52ea4a071ce8eb5a1786ea45fd211ab78)
(cherry picked from commit e13bb8d5290b27281d7742a9b7034929561d51aa)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index aa9ba6a4dfac..7e88997a5372 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2774,11 +2774,11 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) for( sal_uInt16 j = 1; j < rPoly.GetSize(); j ++ ) { - enum PolyFlags flags = rPoly.GetFlags(j); - if( flags == POLY_CONTROL ) + PolyFlags flags = rPoly.GetFlags(j); + if( flags == PolyFlags::Control ) { // a:cubicBezTo can only contain 3 a:pt elements, so we need to make sure of this - if( j+2 < rPoly.GetSize() && rPoly.GetFlags(j+1) == POLY_CONTROL && rPoly.GetFlags(j+2) != POLY_CONTROL ) + if( j+2 < rPoly.GetSize() && rPoly.GetFlags(j+1) == PolyFlags::Control && rPoly.GetFlags(j+2) != PolyFlags::Control ) { mpFS->startElementNS( XML_a, XML_cubicBezTo, FSEND ); @@ -2794,7 +2794,7 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) j += 2; } } - else if( flags == POLY_NORMAL ) + else if( flags == PolyFlags::Normal ) { mpFS->startElementNS( XML_a, XML_lnTo, FSEND ); mpFS->singleElementNS( XML_a, XML_pt, |