[Libreoffice] [PATCH] Removing unused code
Alexander Bergmann
myaddons at gmx.de
Thu Jan 19 04:19:35 PST 2012
---
basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx | 7 --
basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx | 14 ---
basegfx/source/polygon/b2dpolygonclipper.cxx | 66 -------------
basegfx/source/polygon/b3dpolygonclipper.cxx | 102 ---------------------
unusedcode.easy | 6 -
5 files changed, 0 insertions(+), 195 deletions(-)
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
index 172996a..2556b34 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
@@ -57,13 +57,6 @@ namespace basegfx
BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnRange(const B2DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnRange(const B2DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
- // Clip given PolyPolygon against the endless edge (ray) defined by the given two points. bAbove defines on which side
- // of the edge the result will be together with the definition of the edge. If the edge is seen as a vector
- // from A to B and bAbove is true, the result will contain the geometry left of the vector.
- // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
- BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke);
- BASEGFX_DLLPUBLIC B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke);
-
// Clip given PolyPolygon against given clipping polygon.
// The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
// With stroke polygons, You get all line snippets inside rCip.
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
index 0c66967..f34effe 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
@@ -62,26 +62,12 @@ namespace basegfx
// version for Polygons
BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnOrthogonalPlane(const B3DPolygon& rCandidate, B3DOrientation ePlaneOrthogonal, bool bClipPositive, double fPlaneOffset, bool bStroke);
- // Clip the given PolyPolygon against the given range. bInside defines if the result will contain the
- // parts which are contained in the range or vice versa.
- // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
- BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke);
-
// version for Polygons
BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke);
// versions for B2DRange, clips only against X,Y
- BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke);
- // Clip the given PolyPolygon against given plane in 3D. The plane is defined by a plane normal and a point on the plane.
- // The value bClipPositive defines on which side the return value will be (true -> on positive side of plane).
- // The switch bStroke decides if the polygon is interpreted as area (false) or strokes (true).
- BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke);
-
- // version for Polygons
- BASEGFX_DLLPUBLIC B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke);
-
} // end of namespace tools
} // end of namespace basegfx
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 8514fd0..9343c2e 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -346,72 +346,6 @@ namespace basegfx
return aRetval;
}
- B2DPolyPolygon clipPolygonOnEdge(const B2DPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke)
- {
- B2DPolyPolygon aRetval;
-
- if(rPointA.equal(rPointB))
- {
- // edge has no length, return polygon
- aRetval.append(rCandidate);
- }
- else if(rCandidate.count())
- {
- const B2DVector aEdge(rPointB - rPointA);
- B2DPolygon aCandidate(rCandidate);
-
- // translate and rotate polygon so that given edge is on x axis
- B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(-rPointA.getX(), -rPointA.getY()));
- aMatrixTransform.rotate(-atan2(aEdge.getY(), aEdge.getX()));
- aCandidate.transform(aMatrixTransform);
-
- // call clip method on X-Axis
- aRetval = clipPolygonOnParallelAxis(aCandidate, true, bAbove, 0.0, bStroke);
-
- if(aRetval.count())
- {
- // if there is a result, it needs to be transformed back
- aMatrixTransform.invert();
- aRetval.transform(aMatrixTransform);
- }
- }
-
- return aRetval;
- }
-
- B2DPolyPolygon clipPolyPolygonOnEdge(const B2DPolyPolygon& rCandidate, const B2DPoint& rPointA, const B2DPoint& rPointB, bool bAbove, bool bStroke)
- {
- B2DPolyPolygon aRetval;
-
- if(rPointA.equal(rPointB))
- {
- // edge has no length, return polygon
- aRetval = rCandidate;
- }
- else if(rCandidate.count())
- {
- const B2DVector aEdge(rPointB - rPointA);
- B2DPolyPolygon aCandidate(rCandidate);
-
- // translate and rotate polygon so that given edge is on x axis
- B2DHomMatrix aMatrixTransform(basegfx::tools::createTranslateB2DHomMatrix(-rPointA.getX(), -rPointA.getY()));
- aMatrixTransform.rotate(-atan2(aEdge.getY(), aEdge.getX()));
- aCandidate.transform(aMatrixTransform);
-
- // call clip method on X-Axis
- aRetval = clipPolyPolygonOnParallelAxis(aCandidate, true, bAbove, 0.0, bStroke);
-
- if(aRetval.count())
- {
- // if there is a result, it needs to be transformed back
- aMatrixTransform.invert();
- aRetval.transform(aMatrixTransform);
- }
- }
-
- return aRetval;
- }
-
//////////////////////////////////////////////////////////////////////////////
B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke)
diff --git a/basegfx/source/polygon/b3dpolygonclipper.cxx b/basegfx/source/polygon/b3dpolygonclipper.cxx
index 70e4e17..d1c9043 100644
--- a/basegfx/source/polygon/b3dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b3dpolygonclipper.cxx
@@ -306,18 +306,6 @@ namespace basegfx
return aRetval;
}
- B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke)
- {
- B3DPolyPolygon aRetval;
-
- for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
- {
- aRetval.append(clipPolygonOnRange(rCandidate.getB3DPolygon(a), rRange, bInside, bStroke));
- }
-
- return aRetval;
- }
-
B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B2DRange& rRange, bool bInside, bool bStroke)
{
B3DPolyPolygon aRetval;
@@ -404,18 +392,6 @@ namespace basegfx
return aRetval;
}
- B3DPolyPolygon clipPolyPolygonOnRange(const B3DPolyPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke)
- {
- B3DPolyPolygon aRetval;
-
- for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
- {
- aRetval.append(clipPolygonOnRange(rCandidate.getB3DPolygon(a), rRange, bInside, bStroke));
- }
-
- return aRetval;
- }
-
B3DPolyPolygon clipPolygonOnRange(const B3DPolygon& rCandidate, const B3DRange& rRange, bool bInside, bool bStroke)
{
B3DPolyPolygon aRetval;
@@ -486,84 +462,6 @@ namespace basegfx
return aRetval;
}
- B3DPolyPolygon clipPolygonOnPlane(const B3DPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke)
- {
- B3DPolyPolygon aRetval;
-
- if(rPlaneNormal.equalZero())
- {
- // not really a plane definition, return polygon
- aRetval.append(rCandidate);
- }
- else if(rCandidate.count())
- {
- // build transform to project planeNormal on X-Axis and pointOnPlane to null point
- B3DHomMatrix aMatrixTransform;
- aMatrixTransform.translate(-rPointOnPlane.getX(), -rPointOnPlane.getY(), -rPointOnPlane.getZ());
- const double fRotInXY(atan2(rPlaneNormal.getY(), rPlaneNormal.getX()));
- const double fRotInXZ(atan2(-rPlaneNormal.getZ(), rPlaneNormal.getXYLength()));
- if(!fTools::equalZero(fRotInXY) || !fTools::equalZero(fRotInXZ))
- {
- aMatrixTransform.rotate(0.0, fRotInXZ, fRotInXY);
- }
-
- // transform polygon to clip scenario
- B3DPolygon aCandidate(rCandidate);
- aCandidate.transform(aMatrixTransform);
-
- // clip on YZ plane
- aRetval = clipPolygonOnOrthogonalPlane(aCandidate, tools::B3DORIENTATION_X, bClipPositive, 0.0, bStroke);
-
- if(aRetval.count())
- {
- // if there is a result, it needs to be transformed back
- aMatrixTransform.invert();
- aRetval.transform(aMatrixTransform);
- }
- }
-
- return aRetval;
- }
-
- B3DPolyPolygon clipPolyPolygonOnPlane(const B3DPolyPolygon& rCandidate, const B3DPoint& rPointOnPlane, const B3DVector& rPlaneNormal, bool bClipPositive, bool bStroke)
- {
- B3DPolyPolygon aRetval;
-
- if(rPlaneNormal.equalZero())
- {
- // not really a plane definition, return polygon
- aRetval = rCandidate;
- }
- else if(rCandidate.count())
- {
- // build transform to project planeNormal on X-Axis and pointOnPlane to null point
- B3DHomMatrix aMatrixTransform;
- aMatrixTransform.translate(-rPointOnPlane.getX(), -rPointOnPlane.getY(), -rPointOnPlane.getZ());
- const double fRotInXY(atan2(rPlaneNormal.getY(), rPlaneNormal.getX()));
- const double fRotInXZ(atan2(-rPlaneNormal.getZ(), rPlaneNormal.getXYLength()));
- if(!fTools::equalZero(fRotInXY) || !fTools::equalZero(fRotInXZ))
- {
- aMatrixTransform.rotate(0.0, fRotInXZ, fRotInXY);
- }
-
- // transform polygon to clip scenario
- aRetval = rCandidate;
- aRetval.transform(aMatrixTransform);
-
- // clip on YZ plane
- aRetval = clipPolyPolygonOnOrthogonalPlane(aRetval, tools::B3DORIENTATION_X, bClipPositive, 0.0, bStroke);
-
- if(aRetval.count())
- {
- // if there is a result, it needs to be transformed back
- aMatrixTransform.invert();
- aRetval.transform(aMatrixTransform);
- }
- }
-
- return aRetval;
- }
-
} // end of namespace tools
} // end of namespace basegfx
diff --git a/unusedcode.easy b/unusedcode.easy
index c472c72..e2c9dcc 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -956,12 +956,6 @@ basegfx::tools::addPointsAtCuts(basegfx::B2DPolyPolygon const&, bool)
basegfx::tools::addPointsAtCutsAndTouches(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&)
basegfx::tools::applyLineDashing(basegfx::B3DPolyPolygon const&, std::__debug::vector<double, std::allocator<double> > const&, basegfx::B3DPolyPolygon*, basegfx::B3DPolyPolygon*, double)
basegfx::tools::ciexyz2rgb(basegfx::BColor const&)
-basegfx::tools::clipPolyPolygonOnEdge(basegfx::B2DPolyPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, bool, bool)
-basegfx::tools::clipPolyPolygonOnPlane(basegfx::B3DPolyPolygon const&, basegfx::B3DPoint const&, basegfx::B3DVector const&, bool, bool)
-basegfx::tools::clipPolyPolygonOnRange(basegfx::B3DPolyPolygon const&, basegfx::B2DRange const&, bool, bool)
-basegfx::tools::clipPolyPolygonOnRange(basegfx::B3DPolyPolygon const&, basegfx::B3DRange const&, bool, bool)
-basegfx::tools::clipPolygonOnEdge(basegfx::B2DPolygon const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, bool, bool)
-basegfx::tools::clipPolygonOnPlane(basegfx::B3DPolygon const&, basegfx::B3DPoint const&, basegfx::B3DVector const&, bool, bool)
basegfx::tools::createPolygonFromRect(basegfx::B2DRange const&, double)
basegfx::tools::createShearXB2DHomMatrix(double)
basegfx::tools::createShearYB2DHomMatrix(double)
--
1.7.8.3
More information about the LibreOffice
mailing list