summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2015-11-05 10:32:19 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2015-11-05 20:32:47 +0100
commite35ef2502974c74f85c89a9dbc93b1137defcf48 (patch)
treed08e67a0a61013e270a0ba499e20cadc4436bfa4 /tools
parente8d81c0240a66821ebd9ead3718f32d97ecc416d (diff)
class PolyOptimizeData is never instantiated
Change-Id: I136b3b1d572e4401d89d50f543150d71dbe44d16
Diffstat (limited to 'tools')
-rw-r--r--tools/source/generic/poly.cxx11
-rw-r--r--tools/source/generic/poly2.cxx8
2 files changed, 7 insertions, 12 deletions
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index f53dbf19c36c..539178c15b5b 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -904,7 +904,7 @@ double Polygon::CalcDistance( sal_uInt16 nP1, sal_uInt16 nP2 )
return sqrt( fDx * fDx + fDy * fDy );
}
-void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimizeData* pData )
+void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags )
{
DBG_ASSERT( !mpImplPolygon->mpFlagAry, "Optimizing could fail with beziers!" );
@@ -916,7 +916,7 @@ void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimizeData
{
const Rectangle aBound( GetBoundRect() );
const double fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5;
- const sal_uInt16 nPercent = pData ? pData->GetPercentValue() : 50;
+ const sal_uInt16 nPercent = 50;
Optimize( PolyOptimizeFlags::NO_SAME );
ImplReduceEdges( *this, fArea, nPercent );
@@ -925,12 +925,7 @@ void Polygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimizeData
{
tools::Polygon aNewPoly;
const Point& rFirst = mpImplPolygon->mpPointAry[ 0 ];
- sal_uIntPtr nReduce;
-
- if( nOptimizeFlags & ( PolyOptimizeFlags::REDUCE ) )
- nReduce = pData ? pData->GetAbsValue() : 4UL;
- else
- nReduce = 0UL;
+ const sal_uIntPtr nReduce = ( nOptimizeFlags & PolyOptimizeFlags::REDUCE ) ? 4 : 0;
while( nSize && ( mpImplPolygon->mpPointAry[ nSize - 1 ] == rFirst ) )
nSize--;
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 7005a56a90e2..7622c6f1b2a9 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -224,7 +224,7 @@ void PolyPolygon::Clear()
}
}
-void PolyPolygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimizeData* pData )
+void PolyPolygon::Optimize( PolyOptimizeFlags nOptimizeFlags )
{
if(bool(nOptimizeFlags) && Count())
{
@@ -245,7 +245,7 @@ void PolyPolygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimize
tools::PolyPolygon aPolyPoly;
AdaptiveSubdivide(aPolyPoly);
- aPolyPoly.Optimize(nOptimizeFlags, pData);
+ aPolyPoly.Optimize(nOptimizeFlags);
*this = aPolyPoly;
}
else
@@ -259,7 +259,7 @@ void PolyPolygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimize
const Rectangle aBound( GetBoundRect() );
fArea = ( aBound.GetWidth() + aBound.GetHeight() ) * 0.5;
- nPercent = pData ? pData->GetPercentValue() : 50;
+ nPercent = 50;
nOptimizeFlags &= ~PolyOptimizeFlags::EDGES;
}
@@ -280,7 +280,7 @@ void PolyPolygon::Optimize( PolyOptimizeFlags nOptimizeFlags, const PolyOptimize
}
if( bool(nOptimizeFlags) )
- mpImplPolyPolygon->mpPolyAry[ i ]->Optimize( nOptimizeFlags, pData );
+ mpImplPolyPolygon->mpPolyAry[ i ]->Optimize( nOptimizeFlags );
}
}
}