summaryrefslogtreecommitdiff
path: root/tools/source/generic/poly.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'tools/source/generic/poly.cxx')
-rw-r--r--tools/source/generic/poly.cxx26
1 files changed, 8 insertions, 18 deletions
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 46ea1db03e2f..19ac62c9bf0c 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -112,7 +112,7 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rRect )
mxPointAry[4] = rRect.TopLeft();
}
else
- ImplInitDefault();
+ mnPoints = 0;
}
ImplPolygon::ImplPolygon( const tools::Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound )
@@ -164,7 +164,7 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rRect, sal_uInt32 nHorzRound,
}
}
else
- ImplInitDefault();
+ mnPoints = 0;
}
ImplPolygon::ImplPolygon( const Point& rCenter, long nRadX, long nRadY )
@@ -220,7 +220,7 @@ ImplPolygon::ImplPolygon( const Point& rCenter, long nRadX, long nRadY )
}
}
else
- ImplInitDefault();
+ mnPoints = 0;
}
ImplPolygon::ImplPolygon( const tools::Rectangle& rBound, const Point& rStart, const Point& rEnd,
@@ -305,7 +305,7 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rBound, const Point& rStart, c
mxPointAry[nPoints] = mxPointAry[0];
}
else
- ImplInitDefault();
+ mnPoints = 0;
}
ImplPolygon::ImplPolygon( const Point& rBezPt1, const Point& rCtrlPt1,
@@ -352,13 +352,12 @@ ImplPolygon::ImplPolygon( const Point& rBezPt1, const Point& rCtrlPt1,
// and a memcopy at ImplPolygon creation, but contains no zero-controlpoints
// for straight edges.
ImplPolygon::ImplPolygon(const basegfx::B2DPolygon& rPolygon)
+ : mnPoints(0)
{
const bool bCurve(rPolygon.areControlPointsUsed());
const bool bClosed(rPolygon.isClosed());
sal_uInt32 nB2DLocalCount(rPolygon.count());
- ImplInitDefault();
-
if(bCurve)
{
// #127979# Reduce source point count hard to the limit of the tools Polygon
@@ -487,18 +486,9 @@ ImplPolygon::ImplPolygon(const basegfx::B2DPolygon& rPolygon)
bool ImplPolygon::operator==( const ImplPolygon& rCandidate) const
{
- if(mnPoints == rCandidate.mnPoints)
- {
- if (mxFlagAry.get() == rCandidate.mxFlagAry.get() && mxPointAry.get() == rCandidate.mxPointAry.get())
- return true;
- }
-
- return false;
-}
-
-void ImplPolygon::ImplInitDefault()
-{
- mnPoints = 0;
+ return mnPoints == rCandidate.mnPoints &&
+ mxFlagAry.get() == rCandidate.mxFlagAry.get() &&
+ mxPointAry.get() == rCandidate.mxPointAry.get();
}
void ImplPolygon::ImplInitSize(sal_uInt16 nInitSize, bool bFlags)