diff options
author | August Sodora <augsod@gmail.com> | 2012-01-07 20:41:09 -0500 |
---|---|---|
committer | August Sodora <augsod@gmail.com> | 2012-01-08 11:48:09 -0500 |
commit | bc2a59e09d1a554b2d55412d1f10a3fa1fe86086 (patch) | |
tree | 0f588df79ace5b37eff26593e78cf17f4071e1fd /basegfx/source | |
parent | dd7eeed27dc225281ad51e3e41be88ce753e4e8e (diff) |
callcatcher: Remove unused code
Diffstat (limited to 'basegfx/source')
-rw-r--r-- | basegfx/source/curve/b2dcubicbezier.cxx | 8 | ||||
-rw-r--r-- | basegfx/source/matrix/b2dhommatrix.cxx | 34 | ||||
-rw-r--r-- | basegfx/source/range/b2dpolyrange.cxx | 216 | ||||
-rw-r--r-- | basegfx/source/tools/b2dclipstate.cxx | 146 |
4 files changed, 0 insertions, 404 deletions
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx index aa6d5bb2efcd..dd336bc8d161 100644 --- a/basegfx/source/curve/b2dcubicbezier.cxx +++ b/basegfx/source/curve/b2dcubicbezier.cxx @@ -348,14 +348,6 @@ namespace basegfx { } - B2DCubicBezier::B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rEnd) - : maStartPoint(rStart), - maEndPoint(rEnd), - maControlPointA(rStart), - maControlPointB(rEnd) - { - } - B2DCubicBezier::B2DCubicBezier(const B2DPoint& rStart, const B2DPoint& rControlPointA, const B2DPoint& rControlPointB, const B2DPoint& rEnd) : maStartPoint(rStart), maEndPoint(rEnd), diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx index adc984340b9a..942f313eac10 100644 --- a/basegfx/source/matrix/b2dhommatrix.cxx +++ b/basegfx/source/matrix/b2dhommatrix.cxx @@ -76,11 +76,6 @@ namespace basegfx return *this; } - void B2DHomMatrix::makeUnique() - { - mpImpl.make_unique(); - } - double B2DHomMatrix::get(sal_uInt16 nRow, sal_uInt16 nColumn) const { return mpImpl->get(nRow, nColumn); @@ -142,32 +137,6 @@ namespace basegfx return false; } - bool B2DHomMatrix::isNormalized() const - { - return mpImpl->isNormalized(); - } - - void B2DHomMatrix::normalize() - { - if(!const_cast<const B2DHomMatrix*>(this)->mpImpl->isNormalized()) - mpImpl->doNormalize(); - } - - double B2DHomMatrix::determinant() const - { - return mpImpl->doDeterminant(); - } - - double B2DHomMatrix::trace() const - { - return mpImpl->doTrace(); - } - - void B2DHomMatrix::transpose() - { - mpImpl->doTranspose(); - } - B2DHomMatrix& B2DHomMatrix::operator+=(const B2DHomMatrix& rMat) { mpImpl->doAddMatrix(*rMat.mpImpl); @@ -449,7 +418,4 @@ namespace basegfx } } // end of namespace basegfx -/////////////////////////////////////////////////////////////////////////////// -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/range/b2dpolyrange.cxx b/basegfx/source/range/b2dpolyrange.cxx index 01b8d4fbe80a..6046f488150d 100644 --- a/basegfx/source/range/b2dpolyrange.cxx +++ b/basegfx/source/range/b2dpolyrange.cxx @@ -38,13 +38,6 @@ #include <algorithm> #include <vector> -static basegfx::B2VectorOrientation flipOrientation( - basegfx::B2VectorOrientation eOrient) -{ - return eOrient == basegfx::ORIENTATION_POSITIVE ? - basegfx::ORIENTATION_NEGATIVE : basegfx::ORIENTATION_POSITIVE; -} - namespace basegfx { class ImplB2DPolyRange @@ -68,12 +61,6 @@ namespace basegfx maOrient() {} - explicit ImplB2DPolyRange( const B2DPolyRange::ElementType& rElem ) : - maBounds( boost::get<0>(rElem) ), - maRanges( 1, boost::get<0>(rElem) ), - maOrient( 1, boost::get<1>(rElem) ) - {} - explicit ImplB2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient ) : maBounds( rRange ), maRanges( 1, rRange ), @@ -96,41 +83,6 @@ namespace basegfx maOrient[nIndex]); } - void setElement(sal_uInt32 nIndex, const B2DPolyRange::ElementType& rElement ) - { - maRanges[nIndex] = boost::get<0>(rElement); - maOrient[nIndex] = boost::get<1>(rElement); - updateBounds(); - } - - void setElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient ) - { - maRanges[nIndex] = rRange; - maOrient[nIndex] = eOrient; - updateBounds(); - } - - void insertElement(sal_uInt32 nIndex, const B2DPolyRange::ElementType& rElement, sal_uInt32 nCount) - { - maRanges.insert(maRanges.begin()+nIndex, nCount, boost::get<0>(rElement)); - maOrient.insert(maOrient.begin()+nIndex, nCount, boost::get<1>(rElement)); - maBounds.expand(boost::get<0>(rElement)); - } - - void insertElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount) - { - maRanges.insert(maRanges.begin()+nIndex, nCount, rRange); - maOrient.insert(maOrient.begin()+nIndex, nCount, eOrient); - maBounds.expand(rRange); - } - - void appendElement(const B2DPolyRange::ElementType& rElement, sal_uInt32 nCount) - { - maRanges.insert(maRanges.end(), nCount, boost::get<0>(rElement)); - maOrient.insert(maOrient.end(), nCount, boost::get<1>(rElement)); - maBounds.expand(boost::get<0>(rElement)); - } - void appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount) { maRanges.insert(maRanges.end(), nCount, rRange); @@ -138,13 +90,6 @@ namespace basegfx maBounds.expand(rRange); } - void insertPolyRange(sal_uInt32 nIndex, const ImplB2DPolyRange& rPolyRange) - { - maRanges.insert(maRanges.begin()+nIndex, rPolyRange.maRanges.begin(), rPolyRange.maRanges.end()); - maOrient.insert(maOrient.begin()+nIndex, rPolyRange.maOrient.begin(), rPolyRange.maOrient.end()); - updateBounds(); - } - void appendPolyRange(const ImplB2DPolyRange& rPolyRange) { maRanges.insert(maRanges.end(), @@ -156,13 +101,6 @@ namespace basegfx updateBounds(); } - void remove(sal_uInt32 nIndex, sal_uInt32 nCount) - { - maRanges.erase(maRanges.begin()+nIndex,maRanges.begin()+nIndex+nCount); - maOrient.erase(maOrient.begin()+nIndex,maOrient.begin()+nIndex+nCount); - updateBounds(); - } - void clear() { std::vector<B2DRange> aTmpRanges; @@ -174,37 +112,6 @@ namespace basegfx maBounds.reset(); } - void flip() - { - std::for_each(maOrient.begin(), - maOrient.end(), - boost::bind( - &flipOrientation, - _1)); - } - - B2DRange getBounds() const - { - return maBounds; - } - - template< typename ValueType > bool isInside( const ValueType& rValue ) const - { - if( !maBounds.isInside( rValue ) ) - return false; - - // cannot use boost::bind here, since isInside is overloaded. - // It is currently not possible to resolve the overload - // by considering one of the other template arguments. - std::vector<B2DRange>::const_iterator aCurr( maRanges.begin() ); - const std::vector<B2DRange>::const_iterator aEnd ( maRanges.end() ); - while( aCurr != aEnd ) - if( aCurr->isInside( rValue ) ) - return true; - - return false; - } - bool overlaps( const B2DRange& rRange ) const { if( !maBounds.overlaps( rRange ) ) @@ -223,38 +130,6 @@ namespace basegfx return tools::solveCrossovers(maRanges,maOrient); } - const B2DRange* begin() const - { - if(maRanges.empty()) - return 0; - else - return &maRanges.front(); - } - - const B2DRange* end() const - { - if(maRanges.empty()) - return 0; - else - return (&maRanges.back())+1; - } - - B2DRange* begin() - { - if(maRanges.empty()) - return 0; - else - return &maRanges.front(); - } - - B2DRange* end() - { - if(maRanges.empty()) - return 0; - else - return (&maRanges.back())+1; - } - private: B2DRange maBounds; std::vector<B2DRange> maRanges; @@ -268,14 +143,6 @@ namespace basegfx B2DPolyRange::~B2DPolyRange() {} - B2DPolyRange::B2DPolyRange( const ElementType& rElem ) : - mpImpl( ImplB2DPolyRange( rElem ) ) - {} - - B2DPolyRange::B2DPolyRange( const B2DRange& rRange, B2VectorOrientation eOrient ) : - mpImpl( ImplB2DPolyRange( rRange, eOrient ) ) - {} - B2DPolyRange::B2DPolyRange( const B2DPolyRange& rRange ) : mpImpl( rRange.mpImpl ) {} @@ -286,11 +153,6 @@ namespace basegfx return *this; } - void B2DPolyRange::makeUnique() - { - mpImpl.make_unique(); - } - bool B2DPolyRange::operator==(const B2DPolyRange& rRange) const { if(mpImpl.same_object(rRange.mpImpl)) @@ -314,76 +176,21 @@ namespace basegfx return mpImpl->getElement(nIndex); } - void B2DPolyRange::setElement(sal_uInt32 nIndex, const ElementType& rElement ) - { - mpImpl->setElement(nIndex, rElement); - } - - void B2DPolyRange::setElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient ) - { - mpImpl->setElement(nIndex, rRange, eOrient ); - } - - void B2DPolyRange::insertElement(sal_uInt32 nIndex, const ElementType& rElement, sal_uInt32 nCount) - { - mpImpl->insertElement(nIndex, rElement, nCount ); - } - - void B2DPolyRange::insertElement(sal_uInt32 nIndex, const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount) - { - mpImpl->insertElement(nIndex, rRange, eOrient, nCount ); - } - - void B2DPolyRange::appendElement(const ElementType& rElement, sal_uInt32 nCount) - { - mpImpl->appendElement(rElement, nCount); - } - void B2DPolyRange::appendElement(const B2DRange& rRange, B2VectorOrientation eOrient, sal_uInt32 nCount) { mpImpl->appendElement(rRange, eOrient, nCount ); } - void B2DPolyRange::insertPolyRange(sal_uInt32 nIndex, const B2DPolyRange& rRange) - { - mpImpl->insertPolyRange(nIndex, *rRange.mpImpl); - } - void B2DPolyRange::appendPolyRange(const B2DPolyRange& rRange) { mpImpl->appendPolyRange(*rRange.mpImpl); } - void B2DPolyRange::remove(sal_uInt32 nIndex, sal_uInt32 nCount) - { - mpImpl->remove(nIndex, nCount); - } - void B2DPolyRange::clear() { mpImpl->clear(); } - void B2DPolyRange::flip() - { - mpImpl->flip(); - } - - B2DRange B2DPolyRange::getBounds() const - { - return mpImpl->getBounds(); - } - - bool B2DPolyRange::isInside( const B2DTuple& rTuple ) const - { - return mpImpl->isInside(rTuple); - } - - bool B2DPolyRange::isInside( const B2DRange& rRange ) const - { - return mpImpl->isInside(rRange); - } - bool B2DPolyRange::overlaps( const B2DRange& rRange ) const { return mpImpl->overlaps(rRange); @@ -393,29 +200,6 @@ namespace basegfx { return mpImpl->solveCrossovers(); } - - const B2DRange* B2DPolyRange::begin() const - { - return mpImpl->begin(); - } - - const B2DRange* B2DPolyRange::end() const - { - return mpImpl->end(); - } - - B2DRange* B2DPolyRange::begin() - { - return mpImpl->begin(); - } - - B2DRange* B2DPolyRange::end() - { - return mpImpl->end(); - } - } // end of namespace basegfx -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index da55a4de1ae5..963dd39f6785 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -53,21 +53,6 @@ namespace tools mePendingOps(UNION) {} - explicit ImplB2DClipState( const B2DRange& rRange ) : - maPendingPolygons(), - maPendingRanges(), - maClipPoly( - tools::createPolygonFromRect(rRange)), - mePendingOps(UNION) - {} - - explicit ImplB2DClipState( const B2DPolygon& rPoly ) : - maPendingPolygons(), - maPendingRanges(), - maClipPoly(rPoly), - mePendingOps(UNION) - {} - explicit ImplB2DClipState( const B2DPolyPolygon& rPoly ) : maPendingPolygons(), maPendingRanges(), @@ -82,14 +67,6 @@ namespace tools && !maPendingRanges.count(); } - void makeClear() - { - maPendingPolygons.clear(); - maPendingRanges.clear(); - maClipPoly.clear(); - mePendingOps = UNION; - } - bool isNullClipPoly() const { return maClipPoly.count() == 1 @@ -183,14 +160,6 @@ namespace tools addRange(rRange,UNION); } - void unionPolygon(const B2DPolygon& rPoly) - { - if( isCleared() ) - return; - - addPolygon(rPoly,UNION); - } - void unionPolyPolygon(const B2DPolyPolygon& rPolyPoly) { if( isCleared() ) @@ -199,14 +168,6 @@ namespace tools addPolyPolygon(rPolyPoly,UNION); } - void unionClipState(const ImplB2DClipState& rOther) - { - if( isCleared() ) - return; - - addClipState(rOther, UNION); - } - void intersectRange(const B2DRange& rRange) { if( isNull() ) @@ -215,14 +176,6 @@ namespace tools addRange(rRange,INTERSECT); } - void intersectPolygon(const B2DPolygon& rPoly) - { - if( isNull() ) - return; - - addPolygon(rPoly,INTERSECT); - } - void intersectPolyPolygon(const B2DPolyPolygon& rPolyPoly) { if( isNull() ) @@ -231,14 +184,6 @@ namespace tools addPolyPolygon(rPolyPoly,INTERSECT); } - void intersectClipState(const ImplB2DClipState& rOther) - { - if( isNull() ) - return; - - addClipState(rOther, INTERSECT); - } - void subtractRange(const B2DRange& rRange ) { if( isNull() ) @@ -247,14 +192,6 @@ namespace tools addRange(rRange,SUBTRACT); } - void subtractPolygon(const B2DPolygon& rPoly) - { - if( isNull() ) - return; - - addPolygon(rPoly,SUBTRACT); - } - void subtractPolyPolygon(const B2DPolyPolygon& rPolyPoly) { if( isNull() ) @@ -263,34 +200,16 @@ namespace tools addPolyPolygon(rPolyPoly,SUBTRACT); } - void subtractClipState(const ImplB2DClipState& rOther) - { - if( isNull() ) - return; - - addClipState(rOther, SUBTRACT); - } - void xorRange(const B2DRange& rRange) { addRange(rRange,XOR); } - void xorPolygon(const B2DPolygon& rPoly) - { - addPolygon(rPoly,XOR); - } - void xorPolyPolygon(const B2DPolyPolygon& rPolyPoly) { addPolyPolygon(rPolyPoly,XOR); } - void xorClipState(const ImplB2DClipState& rOther) - { - addClipState(rOther, XOR); - } - B2DPolyPolygon getClipPoly() const { commitPendingRanges(); @@ -511,14 +430,6 @@ namespace tools mpImpl(rOrig.mpImpl) {} - B2DClipState::B2DClipState( const B2DRange& rRange ) : - mpImpl( ImplB2DClipState(rRange) ) - {} - - B2DClipState::B2DClipState( const B2DPolygon& rPoly ) : - mpImpl( ImplB2DClipState(rPoly) ) - {} - B2DClipState::B2DClipState( const B2DPolyPolygon& rPolyPoly ) : mpImpl( ImplB2DClipState(rPolyPoly) ) {} @@ -529,26 +440,11 @@ namespace tools return *this; } - void B2DClipState::makeUnique() - { - mpImpl.make_unique(); - } - void B2DClipState::makeNull() { mpImpl->makeNull(); } - bool B2DClipState::isNull() const - { - return mpImpl->isNull(); - } - - void B2DClipState::makeClear() - { - mpImpl->makeClear(); - } - bool B2DClipState::isCleared() const { return mpImpl->isCleared(); @@ -572,81 +468,41 @@ namespace tools mpImpl->unionRange(rRange); } - void B2DClipState::unionPolygon(const B2DPolygon& rPoly) - { - mpImpl->unionPolygon(rPoly); - } - void B2DClipState::unionPolyPolygon(const B2DPolyPolygon& rPolyPoly) { mpImpl->unionPolyPolygon(rPolyPoly); } - void B2DClipState::unionClipState(const B2DClipState& rState) - { - mpImpl->unionClipState(*rState.mpImpl); - } - void B2DClipState::intersectRange(const B2DRange& rRange) { mpImpl->intersectRange(rRange); } - void B2DClipState::intersectPolygon(const B2DPolygon& rPoly) - { - mpImpl->intersectPolygon(rPoly); - } - void B2DClipState::intersectPolyPolygon(const B2DPolyPolygon& rPolyPoly) { mpImpl->intersectPolyPolygon(rPolyPoly); } - void B2DClipState::intersectClipState(const B2DClipState& rState) - { - mpImpl->intersectClipState(*rState.mpImpl); - } - void B2DClipState::subtractRange(const B2DRange& rRange) { mpImpl->subtractRange(rRange); } - void B2DClipState::subtractPolygon(const B2DPolygon& rPoly) - { - mpImpl->subtractPolygon(rPoly); - } - void B2DClipState::subtractPolyPolygon(const B2DPolyPolygon& rPolyPoly) { mpImpl->subtractPolyPolygon(rPolyPoly); } - void B2DClipState::subtractClipState(const B2DClipState& rState) - { - mpImpl->subtractClipState(*rState.mpImpl); - } - void B2DClipState::xorRange(const B2DRange& rRange) { mpImpl->xorRange(rRange); } - void B2DClipState::xorPolygon(const B2DPolygon& rPoly) - { - mpImpl->xorPolygon(rPoly); - } - void B2DClipState::xorPolyPolygon(const B2DPolyPolygon& rPolyPoly) { mpImpl->xorPolyPolygon(rPolyPoly); } - void B2DClipState::xorClipState(const B2DClipState& rState) - { - mpImpl->xorClipState(*rState.mpImpl); - } - B2DPolyPolygon B2DClipState::getClipPoly() const { return mpImpl->getClipPoly(); @@ -655,6 +511,4 @@ namespace tools } // end of namespace tools } // end of namespace basegfx -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |