diff options
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/source/polygon/b2dpolygon.cxx | 46 | ||||
-rw-r--r-- | basegfx/source/polygon/b3dpolygon.cxx | 15 | ||||
-rw-r--r-- | basegfx/source/polygon/b3dpolypolygon.cxx | 8 | ||||
-rw-r--r-- | basegfx/source/polygon/b3dpolypolygontools.cxx | 28 | ||||
-rw-r--r-- | basegfx/source/range/b2dpolyrange.cxx | 18 | ||||
-rw-r--r-- | basegfx/source/range/b2drangeclipper.cxx | 1 | ||||
-rw-r--r-- | basegfx/source/tools/b2dclipstate.cxx | 10 |
7 files changed, 2 insertions, 124 deletions
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index 34eddd72bf2a..e8acddd8799a 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -204,38 +204,6 @@ public: aStart->transform(rMatrix); } } - - const basegfx::B2DPoint* begin() const - { - if(maVector.empty()) - return 0; - else - return &maVector.front(); - } - - const basegfx::B2DPoint* end() const - { - if(maVector.empty()) - return 0; - else - return (&maVector.back())+1; - } - - basegfx::B2DPoint* begin() - { - if(maVector.empty()) - return 0; - else - return &maVector.front(); - } - - basegfx::B2DPoint* end() - { - if(maVector.empty()) - return 0; - else - return (&maVector.back())+1; - } }; @@ -681,19 +649,7 @@ public: } } - ImplB2DPolygon& operator=( const ImplB2DPolygon& rToBeCopied ) - { - maPoints = rToBeCopied.maPoints; - mpControlVector.reset(); - mpBufferedData.reset(); - mbIsClosed = rToBeCopied.mbIsClosed; - - // complete initialization using copy - if(rToBeCopied.mpControlVector && rToBeCopied.mpControlVector->isUsed()) - mpControlVector.reset( new ControlVectorArray2D(*rToBeCopied.mpControlVector) ); - - return *this; - } + ImplB2DPolygon& operator=( const ImplB2DPolygon& ) SAL_DELETED_FUNCTION; sal_uInt32 count() const { diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx index 9e409804e343..ac231e02792d 100644 --- a/basegfx/source/polygon/b3dpolygon.cxx +++ b/basegfx/source/polygon/b3dpolygon.cxx @@ -295,11 +295,6 @@ public: { } - sal_uInt32 count() const - { - return maVector.size(); - } - bool operator==(const BColorArray& rCandidate) const { return (maVector == rCandidate.maVector); @@ -459,11 +454,6 @@ public: { } - sal_uInt32 count() const - { - return maVector.size(); - } - bool operator==(const NormalsArray3D& rCandidate) const { return (maVector == rCandidate.maVector); @@ -633,11 +623,6 @@ public: { } - sal_uInt32 count() const - { - return maVector.size(); - } - bool operator==(const TextureCoordinate2D& rCandidate) const { return (maVector == rCandidate.maVector); diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx index b237bccacc7a..ae90a9410294 100644 --- a/basegfx/source/polygon/b3dpolypolygon.cxx +++ b/basegfx/source/polygon/b3dpolypolygon.cxx @@ -107,14 +107,6 @@ public: return maPolygons.size(); } - void setClosed(bool bNew) - { - for(sal_uInt32 a(0L); a < maPolygons.size(); a++) - { - maPolygons[a].setClosed(bNew); - } - } - void flip() { std::for_each( maPolygons.begin(), diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index 33c0c67f0768..b93a9c49ba6a 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -484,34 +484,6 @@ namespace basegfx } } - - // comparators with tolerance for 3D PolyPolygons - - bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB, const double& rfSmallValue) - { - const sal_uInt32 nPolygonCount(rCandidateA.count()); - - if(nPolygonCount != rCandidateB.count()) - return false; - - for(sal_uInt32 a(0); a < nPolygonCount; a++) - { - const B3DPolygon aCandidate(rCandidateA.getB3DPolygon(a)); - - if(!equal(aCandidate, rCandidateB.getB3DPolygon(a), rfSmallValue)) - return false; - } - - return true; - } - - bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& rCandidateB) - { - const double fSmallValue(fTools::getSmallValue()); - - return equal(rCandidateA, rCandidateB, fSmallValue); - } - /// converters for com::sun::star::drawing::PolyPolygonShape3D B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon( const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource, diff --git a/basegfx/source/range/b2dpolyrange.cxx b/basegfx/source/range/b2dpolyrange.cxx index 90a24d876b12..3722ca467bc3 100644 --- a/basegfx/source/range/b2dpolyrange.cxx +++ b/basegfx/source/range/b2dpolyrange.cxx @@ -33,18 +33,6 @@ namespace basegfx { class ImplB2DPolyRange { - void updateBounds() - { - maBounds.reset(); - std::for_each(maRanges.begin(), - maRanges.end(), - boost::bind( - (void (B2DRange::*)(const B2DRange&))( - &B2DRange::expand), - boost::ref(maBounds), - _1)); - } - public: ImplB2DPolyRange() : maBounds(), @@ -52,12 +40,6 @@ namespace basegfx maOrient() {} - explicit ImplB2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient ) : - maBounds( rRange ), - maRanges( 1, rRange ), - maOrient( 1, eOrient ) - {} - bool operator==(const ImplB2DPolyRange& rRHS) const { return maRanges == rRHS.maRanges && maOrient == rRHS.maOrient; diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index 5d198fb03aa4..4a1725acb331 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -21,6 +21,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/range/b2drangeclipper.hxx> #include <basegfx/range/b2dpolyrange.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index bf77c2536aaa..ddb23181cb87 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -103,16 +103,6 @@ namespace tools ORIENTATION_POSITIVE); } - void addPolygon(B2DPolygon aPoly, Operation eOp) - { - commitPendingRanges(); - if( mePendingOps != eOp ) - commitPendingPolygons(); - - mePendingOps = eOp; - maPendingPolygons.append(aPoly); - } - void addPolyPolygon(B2DPolyPolygon aPoly, Operation eOp) { commitPendingRanges(); |