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

remove unused PolyOptimizeFlags enum values

Change-Id: I3a2145277212b7b45c25bea2e33aae3f6f4a7776
Reviewed-on: https://gerrit.libreoffice.org/64066
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 33e80611
......@@ -556,10 +556,6 @@ include/svx/xoutbmp.hxx:36
enum XOutFlags ContourVert
include/tools/inetmsg.hxx:70
enum InetMessageMime NUMHDR
include/tools/poly.hxx:34
enum PolyOptimizeFlags OPEN
include/tools/poly.hxx:37
enum PolyOptimizeFlags REDUCE
include/unotools/fontcfg.hxx:51
enum ImplFontAttrs Default
include/unotools/fontcfg.hxx:52
......
......@@ -31,15 +31,13 @@
enum class PolyOptimizeFlags {
NONE = 0x0000,
OPEN = 0x0001,
CLOSE = 0x0002,
NO_SAME = 0x0004,
REDUCE = 0x0008,
EDGES = 0x0010,
CLOSE = 0x0001,
NO_SAME = 0x0002,
EDGES = 0x0004,
};
namespace o3tl
{
template<> struct typed_flags<PolyOptimizeFlags> : is_typed_flags<PolyOptimizeFlags, 0x001f> {};
template<> struct typed_flags<PolyOptimizeFlags> : is_typed_flags<PolyOptimizeFlags, 0x0007> {};
}
enum class PolyStyle
......
......@@ -1033,11 +1033,10 @@ void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags )
Optimize( PolyOptimizeFlags::NO_SAME );
ImplReduceEdges( *this, fArea, nPercent );
}
else if( nOptimizeFlags & ( PolyOptimizeFlags::REDUCE | PolyOptimizeFlags::NO_SAME ) )
else if( nOptimizeFlags & PolyOptimizeFlags::NO_SAME )
{
tools::Polygon aNewPoly;
const Point& rFirst = mpImplPolygon->mxPointAry[ 0 ];
const int nReduce = ( nOptimizeFlags & PolyOptimizeFlags::REDUCE ) ? 4 : 0;
while( nSize && ( mpImplPolygon->mxPointAry[ nSize - 1 ] == rFirst ) )
nSize--;
......@@ -1051,8 +1050,7 @@ void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags )
for( sal_uInt16 i = 1; i < nSize; i++ )
{
if( ( mpImplPolygon->mxPointAry[ i ] != mpImplPolygon->mxPointAry[ nLast ] ) &&
( !nReduce || ( nReduce < FRound( CalcDistance( nLast, i ) ) ) ) )
if( mpImplPolygon->mxPointAry[ i ] != mpImplPolygon->mxPointAry[ nLast ])
{
nLast = i;
aNewPoly[ nNewCount++ ] = mpImplPolygon->mxPointAry[ i ];
......@@ -1078,16 +1076,6 @@ void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags )
SetSize( mpImplPolygon->mnPoints + 1 );
mpImplPolygon->mxPointAry[ mpImplPolygon->mnPoints - 1 ] = mpImplPolygon->mxPointAry[ 0 ];
}
else if( ( nOptimizeFlags & PolyOptimizeFlags::OPEN ) &&
( mpImplPolygon->mxPointAry[ 0 ] == mpImplPolygon->mxPointAry[ nSize - 1 ] ) )
{
const Point& rFirst = mpImplPolygon->mxPointAry[ 0 ];
while( nSize && ( mpImplPolygon->mxPointAry[ nSize - 1 ] == rFirst ) )
nSize--;
SetSize( nSize );
}
}
}
}
......
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