diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:47:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 10:34:17 +0000 |
| commit | a08cb3b52ea4a071ce8eb5a1786ea45fd211ab78 (patch) | |
| tree | 0667c60e438b660211a3df83c1b411e055b1de61 /filter/source/msfilter/escherex.cxx | |
| parent | 62283fed204e05e3f30a8ae703762d7f96c4e88a (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>
Diffstat (limited to 'filter/source/msfilter/escherex.cxx')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 8810f9fd57d1..c7d31c423a91 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1951,7 +1951,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( nTotalPoints += k; for (sal_uInt16 j = 0; j < k; ++j) { - if ( aPolyPolygon[ i ].GetFlags( j ) != POLY_CONTROL ) + if ( aPolyPolygon[ i ].GetFlags( j ) != PolyFlags::Control ) nTotalBezPoints++; } } @@ -2013,7 +2013,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( if ( ( i + 1 ) != nPoints ) { *pPtr++ = 1; - if ( aPolygon.GetFlags( i + 1 ) == POLY_CONTROL ) + if ( aPolygon.GetFlags( i + 1 ) == PolyFlags::Control ) { *pPtr++ = 0x20; i += 2; @@ -4669,7 +4669,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) const tools::Polygon& rPoly = aPolyPoly.GetObject( a ); for ( b = 0; b < rPoly.GetSize(); b++ ) { - if ( rPoly.GetFlags( b ) != POLY_NORMAL ) + if ( rPoly.GetFlags( b ) != PolyFlags::Normal ) continue; const Point& rPt = rPoly[ b ]; sal_uInt32 nDist = (sal_uInt32)hypot( aRefPoint.X - rPt.X(), aRefPoint.Y - rPt.Y() ); |