diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-05 05:53:02 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-06 02:15:20 +0200 |
commit | 10f696d103bcf0ba2e3f76eb4ff7a4c70fe4683c (patch) | |
tree | 9392ad9b1a7267af6e48efede7f385f222161483 /basegfx | |
parent | d1e6ecb3538e06cd4691e4296597748b9394410d (diff) |
remove unnecessary whitespaces in basegfx
Change-Id: Ia97fb3895e855e9fb970b0874fc100e2b900a8b7
Diffstat (limited to 'basegfx')
40 files changed, 0 insertions, 296 deletions
diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx index ae0fdee7ded4..44515fa51dbb 100644 --- a/basegfx/source/color/bcolormodifier.cxx +++ b/basegfx/source/color/bcolormodifier.cxx @@ -19,8 +19,6 @@ #include <basegfx/color/bcolormodifier.hxx> - - namespace basegfx { BColorModifier::~BColorModifier() @@ -28,8 +26,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_gray::~BColorModifier_gray() @@ -49,8 +45,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_invert::~BColorModifier_invert() @@ -68,8 +62,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_luminance_to_alpha::~BColorModifier_luminance_to_alpha() @@ -89,8 +81,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_replace::~BColorModifier_replace() @@ -115,8 +105,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_interpolate::~BColorModifier_interpolate() @@ -141,8 +129,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_black_and_white::~BColorModifier_black_and_white() @@ -176,8 +162,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_gamma::BColorModifier_gamma(double fValue) @@ -228,8 +212,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { BColorModifier_RGBLuminanceContrast::BColorModifier_RGBLuminanceContrast(double fRed, double fGreen, double fBlue, double fLuminance, double fContrast) @@ -311,8 +293,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { ::basegfx::BColor BColorModifierStack::getModifiedColor(const ::basegfx::BColor& rSource) const diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx index 400eb910d16c..293deb836517 100644 --- a/basegfx/source/color/bcolortools.cxx +++ b/basegfx/source/color/bcolortools.cxx @@ -21,8 +21,6 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/color/bcolortools.hxx> - - namespace basegfx { namespace tools { BColor rgb2hsl(const BColor& rRGBColor) diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx index e7d77ce89c0f..58d1f1e14f7a 100644 --- a/basegfx/source/curve/b2dbeziertools.cxx +++ b/basegfx/source/curve/b2dbeziertools.cxx @@ -21,8 +21,6 @@ #include <basegfx/curve/b2dcubicbezier.hxx> #include <algorithm> - - namespace basegfx { B2DCubicBezierHelper::B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions) diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx index a331e0ed6431..b2b53fc31970 100644 --- a/basegfx/source/curve/b2dcubicbezier.cxx +++ b/basegfx/source/curve/b2dcubicbezier.cxx @@ -30,8 +30,6 @@ static double fMultFactUnsharpen = FACTOR_FOR_UNSHARPEN; #endif - - namespace basegfx { namespace @@ -323,8 +321,6 @@ namespace basegfx } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { B2DCubicBezier::B2DCubicBezier(const B2DCubicBezier& rBezier) diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx index 936817e54d3c..88409d586cb0 100644 --- a/basegfx/source/matrix/b2dhommatrix.cxx +++ b/basegfx/source/matrix/b2dhommatrix.cxx @@ -25,8 +25,6 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - - namespace basegfx { class Impl2DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 3 > diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx index 33a9231db4e4..386ee9bc78bc 100644 --- a/basegfx/source/matrix/b2dhommatrixtools.cxx +++ b/basegfx/source/matrix/b2dhommatrixtools.cxx @@ -21,8 +21,6 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> - - namespace basegfx { namespace tools diff --git a/basegfx/source/point/b2dpoint.cxx b/basegfx/source/point/b2dpoint.cxx index 9e40b6a21838..9775e1476740 100644 --- a/basegfx/source/point/b2dpoint.cxx +++ b/basegfx/source/point/b2dpoint.cxx @@ -21,8 +21,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> - - namespace basegfx { B2DPoint& B2DPoint::operator=( const ::basegfx::B2DTuple& rPoint ) diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 35d98a27b653..7d99fea243c8 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -31,8 +31,6 @@ #include <com/sun/star/drawing/LineCap.hpp> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> - - namespace basegfx { namespace tools @@ -130,8 +128,6 @@ namespace basegfx } // end of namespace tools } // end of namespace basegfx - - namespace basegfx { // anonymus namespace for local helpers diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx index e8acddd8799a..096c4a01f44d 100644 --- a/basegfx/source/polygon/b2dpolygon.cxx +++ b/basegfx/source/polygon/b2dpolygon.cxx @@ -29,8 +29,6 @@ #include <vector> #include <algorithm> - - struct CoordinateData2D : public basegfx::B2DPoint { public: @@ -52,8 +50,6 @@ public: } }; - - class CoordinateDataArray2D { typedef ::std::vector< CoordinateData2D > CoordinateData2DVector; @@ -206,8 +202,6 @@ public: } }; - - class ControlVectorPair2D { basegfx::B2DVector maPrevVector; @@ -249,8 +243,6 @@ public: } }; - - class ControlVectorArray2D { typedef ::std::vector< ControlVectorPair2D > ControlVectorPair2DVector; @@ -472,8 +464,6 @@ public: } }; - - class ImplBufferedData { private: @@ -568,8 +558,6 @@ public: } }; - - class ImplB2DPolygon { private: @@ -1106,8 +1094,6 @@ public: } }; - - namespace basegfx { namespace diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 817a43955900..b8d4a04bed30 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -29,8 +29,6 @@ #include <basegfx/tools/rectcliptools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - - namespace basegfx { namespace tools @@ -337,8 +335,6 @@ namespace basegfx return aRetval; } - - B2DPolyPolygon clipPolyPolygonOnPolyPolygon(const B2DPolyPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke) { B2DPolyPolygon aRetval; @@ -461,8 +457,6 @@ namespace basegfx return aRetval; } - - B2DPolyPolygon clipPolygonOnPolyPolygon(const B2DPolygon& rCandidate, const B2DPolyPolygon& rClip, bool bInside, bool bStroke) { B2DPolyPolygon aRetval; @@ -475,8 +469,6 @@ namespace basegfx return aRetval; } - - /* * let a plane be defined as * @@ -779,8 +771,6 @@ namespace basegfx return aResult; } - - } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx index 927af8828c91..3eae85f5c500 100644 --- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx +++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx @@ -30,17 +30,13 @@ #include <vector> #include <algorithm> - #define SUBDIVIDE_FOR_CUT_TEST_COUNT (50) - - namespace basegfx { namespace { - class temporaryPoint { B2DPoint maPoint; // the new point @@ -70,12 +66,8 @@ namespace basegfx double getCut() const { return mfCut; } }; - - typedef ::std::vector< temporaryPoint > temporaryPointVector; - - class temporaryPolygonData { B2DPolygon maPolygon; @@ -89,8 +81,6 @@ namespace basegfx temporaryPointVector& getTemporaryPointVector() { return maPoints; } }; - - B2DPolygon mergeTemporaryPointsAndPolygon(const B2DPolygon& rCandidate, temporaryPointVector& rTempPoints) { // #i76891# mergeTemporaryPointsAndPolygon redesigned to be able to correctly handle @@ -180,8 +170,6 @@ namespace basegfx } } - - void adaptAndTransferCutsWithBezierSegment( const temporaryPointVector& rPointVector, const B2DPolygon& rPolygon, sal_uInt32 nInd, temporaryPointVector& rTempPoints) @@ -205,13 +193,9 @@ namespace basegfx } } - - } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace @@ -223,8 +207,6 @@ namespace basegfx void findTouches(const B2DPolygon& rEdgePolygon, const B2DPolygon& rPointPolygon, temporaryPointVector& rTempPoints); void findCuts(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB); - - void findEdgeCutsTwoEdges( const B2DPoint& rCurrA, const B2DPoint& rNextA, const B2DPoint& rCurrB, const B2DPoint& rNextB, @@ -277,8 +259,6 @@ namespace basegfx } } - - void findCutsAndTouchesAndCommonForBezier(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB) { // #i76891# @@ -399,8 +379,6 @@ namespace basegfx } } - - void findEdgeCutsBezierAndEdge( const B2DCubicBezier& rCubicA, const B2DPoint& rCurrB, const B2DPoint& rNextB, @@ -440,8 +418,6 @@ namespace basegfx } } - - void findEdgeCutsTwoBeziers( const B2DCubicBezier& rCubicA, const B2DCubicBezier& rCubicB, @@ -481,8 +457,6 @@ namespace basegfx } } - - void findEdgeCutsOneBezier( const B2DCubicBezier& rCubicA, sal_uInt32 nInd, temporaryPointVector& rTempPoints) @@ -514,8 +488,6 @@ namespace basegfx } } - - void findCuts(const B2DPolygon& rCandidate, temporaryPointVector& rTempPoints) { // find out if there are edges with intersections (self-cuts). If yes, add @@ -627,19 +599,14 @@ namespace basegfx } } - - } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace { - void findTouchesOnEdge( const B2DPoint& rCurr, const B2DPoint& rNext, const B2DPolygon& rPointPolygon, sal_uInt32 nInd, temporaryPointVector& rTempPoints) @@ -685,8 +652,6 @@ namespace basegfx } } - - void findTouchesOnCurve( const B2DCubicBezier& rCubicA, const B2DPolygon& rPointPolygon, sal_uInt32 nInd, temporaryPointVector& rTempPoints) @@ -711,8 +676,6 @@ namespace basegfx } } - - void findTouches(const B2DPolygon& rEdgePolygon, const B2DPolygon& rPointPolygon, temporaryPointVector& rTempPoints) { // find out if points from rPointPolygon touch edges from rEdgePolygon. If yes, @@ -760,19 +723,14 @@ namespace basegfx } } - - } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace { - void findCuts(const B2DPolygon& rCandidateA, const B2DPolygon& rCandidateB, temporaryPointVector& rTempPointsA, temporaryPointVector& rTempPointsB) { // find out if edges from both polygons cut. If so, add entries to rTempPoints which @@ -880,19 +838,14 @@ namespace basegfx } } - - } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace tools { - B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate) { if(rCandidate.count()) @@ -910,8 +863,6 @@ namespace basegfx } } - - B2DPolyPolygon addPointsAtCutsAndTouches(const B2DPolyPolygon& rCandidate, bool bSelfIntersections) { const sal_uInt32 nCount(rCandidate.count()); @@ -995,8 +946,6 @@ namespace basegfx } } - - B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPoint& rStart, const B2DPoint& rEnd) { const sal_uInt32 nCount(rCandidate.count()); @@ -1044,8 +993,6 @@ namespace basegfx return rCandidate; } - - B2DPolygon addPointsAtCuts(const B2DPolygon& rCandidate, const B2DPolyPolygon& rPolyMask) { const sal_uInt32 nCountA(rCandidate.count()); @@ -1127,8 +1074,6 @@ namespace basegfx return rCandidate; } - - } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 3b4958014a38..8b5c9540e406 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -45,8 +45,6 @@ static double fAngleBoundStartValue = ANGLE_BOUND_START_VALUE; #endif #define STEPSPERQUARTER (3) - - namespace basegfx { namespace tools @@ -3308,7 +3306,6 @@ namespace basegfx return aRetval; } - // converters for com::sun::star::drawing::PointSequence B2DPolygon UnoPointSequenceToB2DPolygon( @@ -3384,7 +3381,6 @@ namespace basegfx } } - // converters for com::sun::star::drawing::PointSequence and // com::sun::star::drawing::FlagSequence to B2DPolygon (curved polygons) diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx index bd5d96e6aba7..0f02913ffeb5 100644 --- a/basegfx/source/polygon/b2dpolygontriangulator.cxx +++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx @@ -29,8 +29,6 @@ #include <algorithm> - - namespace basegfx { namespace @@ -110,13 +108,9 @@ namespace basegfx void setNext(EdgeEntry* pNext) { mpNext = pNext; } }; - - typedef ::std::vector< EdgeEntry > EdgeEntries; typedef ::std::vector< EdgeEntry* > EdgeEntryPointers; - - class Triangulator { EdgeEntry* mpList; @@ -389,8 +383,6 @@ namespace basegfx } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace triangulator diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx index 40abbc4c5128..92b74e7e3e52 100644 --- a/basegfx/source/polygon/b2dpolypolygon.cxx +++ b/basegfx/source/polygon/b2dpolypolygon.cxx @@ -27,8 +27,6 @@ #include <functional> #include <algorithm> - - class ImplB2DPolyPolygon { basegfx::B2DPolygonVector maPolygons; @@ -175,8 +173,6 @@ public: } }; - - namespace basegfx { namespace { struct DefaultPolyPolygon: public rtl::Static<B2DPolyPolygon::ImplType, diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index 47cda51e0db5..aaad33500c21 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -31,14 +31,11 @@ #include <vector> #include <algorithm> - - namespace basegfx { namespace { - struct StripHelper { B2DRange maRange; @@ -46,8 +43,6 @@ namespace basegfx B2VectorOrientation meOrinetation; }; - - struct PN { public: @@ -57,8 +52,6 @@ namespace basegfx sal_uInt32 mnIN; }; - - struct VN { public: @@ -72,8 +65,6 @@ namespace basegfx B2DVector maOriginalNext; }; - - struct SN { public: @@ -99,16 +90,12 @@ namespace basegfx } }; - - typedef ::std::vector< PN > PNV; typedef ::std::vector< VN > VNV; typedef ::std::vector< SN > SNV; typedef ::std::pair< basegfx::B2DPoint /*orig*/, basegfx::B2DPoint /*repl*/ > CorrectionPair; typedef ::std::vector< CorrectionPair > CorrectionTable; - - class solver { private: @@ -691,19 +678,14 @@ namespace basegfx } }; - - } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace tools { - B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate) { if(rCandidate.count() > 1L) @@ -717,16 +699,12 @@ namespace basegfx } } - - B2DPolyPolygon solveCrossovers(const B2DPolygon& rCandidate) { solver aSolver(rCandidate); return aSolver.getB2DPolyPolygon(); } - - B2DPolyPolygon stripNeutralPolygons(const B2DPolyPolygon& rCandidate) { B2DPolyPolygon aRetval; @@ -744,8 +722,6 @@ namespace basegfx return aRetval; } - - B2DPolyPolygon createNonzeroConform(const B2DPolyPolygon& rCandidate) { B2DPolyPolygon aCandidate; @@ -832,8 +808,6 @@ namespace basegfx return aCandidate; } - - B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero) { const sal_uInt32 nCount(rCandidate.count()); @@ -936,8 +910,6 @@ namespace basegfx return aRetval; } - - B2DPolyPolygon prepareForPolygonOperation(const B2DPolygon& rCandidate) { solver aSolver(rCandidate); @@ -1134,8 +1106,6 @@ namespace basegfx return B2DPolyPolygon(); } - - } // end of namespace tools } // end of namespace basegfx diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx index 35bc6ed14d47..37526219d992 100644 --- a/basegfx/source/polygon/b2dpolypolygontools.cxx +++ b/basegfx/source/polygon/b2dpolypolygontools.cxx @@ -26,8 +26,6 @@ #include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <numeric> - - namespace basegfx { namespace tools @@ -647,7 +645,6 @@ namespace basegfx return aRes; } - // converters for com::sun::star::drawing::PointSequence B2DPolyPolygon UnoPointSequenceSequenceToB2DPolyPolygon( @@ -692,7 +689,6 @@ namespace basegfx } } - // converters for com::sun::star::drawing::PolyPolygonBezierCoords (curved polygons) B2DPolyPolygon UnoPolyPolygonBezierCoordsToB2DPolyPolygon( diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index 3dafe5ca4628..13184f965a0b 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -22,8 +22,6 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <list> - - namespace basegfx { namespace trapezoidhelper @@ -56,12 +54,10 @@ namespace basegfx const B2DPoint& getEnd() const { return *mpEnd; } }; - // define vector of simple edges typedef ::std::vector< TrDeSimpleEdge > TrDeSimpleEdges; - // helper class for holding a traversing edge. It will always have some // distance in YPos. The slope (in a numerically useful form, see comments) is // hold and used in SortValue to allow sorting traversing edges by Y, X and slope @@ -179,7 +175,6 @@ namespace basegfx } }; - // define double linked list of edges (for fast random insert) typedef ::std::list< TrDeEdgeEntry > TrDeEdgeEntries; @@ -187,8 +182,6 @@ namespace basegfx } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { namespace trapezoidhelper @@ -898,8 +891,6 @@ namespace basegfx } // end of anonymous namespace } // end of namespace basegfx - - namespace basegfx { B2DTrapezoid::B2DTrapezoid( @@ -951,8 +942,6 @@ namespace basegfx } } // end of namespace basegfx - - namespace basegfx { namespace tools diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx index ac231e02792d..345877004836 100644 --- a/basegfx/source/polygon/b3dpolygon.cxx +++ b/basegfx/source/polygon/b3dpolygon.cxx @@ -28,8 +28,6 @@ #include <vector> #include <algorithm> - - class CoordinateData3D { basegfx::B3DPoint maPoint; @@ -67,8 +65,6 @@ public: } }; - - class CoordinateDataArray3D { typedef ::std::vector< CoordinateData3D > CoordinateData3DVector; @@ -249,8 +245,6 @@ public: } }; - - class BColorArray { typedef ::std::vector< ::basegfx::BColor > BColorDataVector; @@ -409,8 +403,6 @@ public: } }; - - class NormalsArray3D { typedef ::std::vector< ::basegfx::B3DVector > NormalsData3DVector; @@ -578,8 +570,6 @@ public: } }; - - class TextureCoordinate2D { typedef ::std::vector< ::basegfx::B2DPoint > TextureData2DVector; @@ -747,8 +737,6 @@ public: } }; - - class ImplB3DPolygon { // The point vector. This vector exists always and defines the @@ -1505,8 +1493,6 @@ public: } }; - - namespace basegfx { namespace { struct DefaultPolygon : public rtl::Static< B3DPolygon::ImplType, diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index f3e42700c10a..8f3e9c8b74ec 100644 --- a/basegfx/source/polygon/b3dpolygontools.cxx +++ b/basegfx/source/polygon/b3dpolygontools.cxx @@ -29,8 +29,6 @@ #include <basegfx/tuple/b3ituple.hxx> #include <numeric> - - namespace basegfx { namespace tools diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx index ae90a9410294..a96d4dac7355 100644 --- a/basegfx/source/polygon/b3dpolypolygon.cxx +++ b/basegfx/source/polygon/b3dpolypolygon.cxx @@ -27,8 +27,6 @@ #include <vector> #include <algorithm> - - class ImplB3DPolyPolygon { typedef ::std::vector< ::basegfx::B3DPolygon > PolygonVector; @@ -202,8 +200,6 @@ public: } }; - - namespace basegfx { namespace { struct DefaultPolyPolygon : public rtl::Static<B3DPolyPolygon::ImplType, diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index b93a9c49ba6a..f61a09c0104c 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -28,13 +28,10 @@ #include <basegfx/numeric/ftools.hxx> #include <com/sun/star/drawing/DoubleSequence.hpp> - // predefines #define nMinSegments sal_uInt32(1) #define nMaxSegments sal_uInt32(512) - - namespace basegfx { namespace tools diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index 860283cf20ca..3f8f6f641d80 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -35,7 +35,6 @@ #include <deque> #include <list> - namespace basegfx { namespace @@ -50,7 +49,6 @@ namespace basegfx class ImplPolygon; typedef o3tl::vector_pool<ImplPolygon> VectorOfPolygons; - /** This class represents an active edge As the sweep line traverses across the overall area, @@ -147,7 +145,6 @@ namespace basegfx // Needs to be list - various places hold ptrs to elements typedef std::list< ActiveEdge > ListOfEdges; - /** Element of the sweep line event list As the sweep line traverses across the overall area, @@ -234,7 +231,6 @@ namespace basegfx typedef std::vector< SweepLineEvent > VectorOfEvents; - /** Smart point container for B2DMultiRange::getPolyPolygon() This class provides methods needed only here, and is used diff --git a/basegfx/source/range/b2xrange.cxx b/basegfx/source/range/b2xrange.cxx index 61434bf0bb4a..9ee5b9060026 100644 --- a/basegfx/source/range/b2xrange.cxx +++ b/basegfx/source/range/b2xrange.cxx @@ -21,7 +21,6 @@ #include <basegfx/range/b2irange.hxx> #include <basegfx/range/b2ibox.hxx> - namespace basegfx { namespace diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx index 5132ade1cc52..946a343d64c4 100644 --- a/basegfx/source/raster/rasterconvert3d.cxx +++ b/basegfx/source/raster/rasterconvert3d.cxx @@ -22,7 +22,6 @@ #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/point/b3dpoint.hxx> - // implementations of the 3D raster converter namespace basegfx diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx index f8c4569ec3a4..95ed692c859d 100644 --- a/basegfx/source/tools/tools.cxx +++ b/basegfx/source/tools/tools.cxx @@ -22,7 +22,6 @@ #include <algorithm> - namespace basegfx { namespace tools diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx index 7e6230945fc9..4dae8020f58b 100644 --- a/basegfx/source/tools/unopolypolygon.cxx +++ b/basegfx/source/tools/unopolypolygon.cxx @@ -34,7 +34,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <cppuhelper/supportsservice.hxx> - using namespace ::com::sun::star; namespace basegfx diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx index d4ff311ea017..c1c5044070be 100644 --- a/basegfx/source/tools/unotools.cxx +++ b/basegfx/source/tools/unotools.cxx @@ -28,7 +28,6 @@ #include <basegfx/tools/unotools.hxx> #include <comphelper/sequence.hxx> - using namespace ::com::sun::star; namespace basegfx @@ -153,8 +152,6 @@ namespace unotools return aNewPolyPolygon; } - - void b2DPolyPolygonToPolyPolygonBezier( const basegfx::B2DPolyPolygon& rPolyPoly, drawing::PolyPolygonBezierCoords& rRetval ) { diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx index 9ee6c91f39bf..ace0a0a95320 100644 --- a/basegfx/source/vector/b2dvector.cxx +++ b/basegfx/source/vector/b2dvector.cxx @@ -58,7 +58,6 @@ namespace basegfx return *this; } - double B2DVector::getLength() const { if(fTools::equalZero(mfX)) @@ -73,8 +72,6 @@ namespace basegfx return hypot( mfX, mfY ); } - - double B2DVector::angle( const B2DVector& rVec ) const { return atan2(mfX * rVec.getY() - mfY * rVec.getX(), diff --git a/basegfx/source/vector/b2ivector.cxx b/basegfx/source/vector/b2ivector.cxx index d7cc9a4f37a0..7e3e65d75bee 100644 --- a/basegfx/source/vector/b2ivector.cxx +++ b/basegfx/source/vector/b2ivector.cxx @@ -30,7 +30,6 @@ namespace basegfx return *this; } - B2IVector& B2IVector::operator*=( const B2DHomMatrix& rMat ) { mnX = fround( rMat.get(0,0)*mnX + diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx index ea8028904a67..88fe80549643 100644 --- a/basegfx/source/vector/b3dvector.cxx +++ b/basegfx/source/vector/b3dvector.cxx @@ -20,8 +20,6 @@ #include <basegfx/vector/b3dvector.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> - - namespace basegfx { B3DVector& B3DVector::normalize() diff --git a/basegfx/source/workbench/bezierclip.cxx b/basegfx/source/workbench/bezierclip.cxx index c35eb2a6b3a8..d7162afaa1ac 100644 --- a/basegfx/source/workbench/bezierclip.cxx +++ b/basegfx/source/workbench/bezierclip.cxx @@ -27,8 +27,6 @@ #include "bezierclip.hxx" #include "gauss.hxx" - - // what to test #define WITH_ASSERTIONS //#define WITH_CONVEXHULL_TEST @@ -43,10 +41,6 @@ //#define WITH_SAFEFOCUSPARAM_DETAILED_TEST #define WITH_BEZIERCLIP_TEST - - - - /* Implementation of the so-called 'Fat-Line Bezier Clipping Algorithm' by Sederberg et al. * * Actual reference is: T. W. Sederberg and T Nishita: Curve @@ -54,8 +48,6 @@ * (9), 1990, pp. 538--549 */ - - /* Misc helper * =========== */ @@ -74,21 +66,15 @@ int fallFac( int n, int k ) return res; } - - int fac( int n ) { return fallFac(n, n); } - - /* Bezier fat line clipping part * ============================= */ - - void Impl_calcFatLine( FatLine& line, const Bezier& c ) { // Prepare normalized implicit line @@ -108,7 +94,6 @@ void Impl_calcFatLine( FatLine& line, const Bezier& c ) line.c = -(line.a*c.p0.x + line.b*c.p0.y); - // Determine bounding fat line from it // =================================== @@ -270,7 +255,6 @@ bool Impl_calcSafeParams( double& t1, return bIntersection; } - /* calculates two t's for the given bernstein polynomial: the first is * the intersection of the min value line with the convex hull from * the left, the second is the intersection of the max value line with @@ -340,8 +324,6 @@ bool Impl_calcSafeParams_clip( double& t1, #endif } - - void Impl_deCasteljauAt( Bezier& part1, Bezier& part2, const Bezier& input, @@ -389,8 +371,6 @@ void Impl_deCasteljauAt( Bezier& part1, } } - - void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1, double t2_c1, const Bezier& c2_part, const FatLine& bounds_c2 ) { @@ -473,8 +453,6 @@ void printCurvesWithSafeRange( const Bezier& c1, const Bezier& c2, double t1_c1, offset += 1; } - - void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part, const Bezier& c2, const Bezier& c2_part, double t1_c1, double t2_c1 ) @@ -548,8 +526,6 @@ void printResultWithFinalCurves( const Bezier& c1, const Bezier& c1_part, offset += 1; } - - /** determine parameter ranges [0,t1) and (t2,1] on c1, where c1 is guaranteed to lie outside c2. Returns false, if the two curves don't even intersect. @@ -628,14 +604,10 @@ bool Impl_calcClipRange( double& t1, return false; } - - /* Tangent intersection part * ========================= */ - - void Impl_calcFocus( Bezier& res, const Bezier& c ) { // arbitrary small value, for now @@ -693,7 +665,6 @@ void Impl_calcFocus( Bezier& res, const Bezier& c ) // (P0.y - P1.y)c0 + (P3.y - P2.y)c1 = (P3.x - P0.x)/3 // (P1.x - P0.x)c0 + (P2.x - P3.x)c1 = (P3.y - P0.y)/3 - // so, this is what we calculate here (determine c0 and c1): fMatrix[0] = c.p1.x - c.p0.x; fMatrix[1] = c.p2.x - c.p3.x; @@ -761,8 +732,6 @@ void Impl_calcFocus( Bezier& res, const Bezier& c ) res.p3.y = c.p3.y + 3*fRes[1]*(c.p3.x - c.p2.x); } - - bool Impl_calcSafeParams_focus( double& t1, double& t2, const Bezier& curve, @@ -796,7 +765,6 @@ bool Impl_calcSafeParams_focus( double& t1, // d_i = \sum_{j+k=i, j\in\{0,...,n\}, k\in\{0,...,n-1\}} \frac{\binom{n}{j}\binom{n-1}{k}}{\binom{2n-1}{i}} n (P_{k+1} - P_k)^T(P_j - F) - // Okay, but F is now not a single point, but itself a curve // F(u). Thus, for every value of u, we get a different 2n-1 // bezier curve from the above equation. Therefore, we have a @@ -821,14 +789,12 @@ bool Impl_calcSafeParams_focus( double& t1, // \fallfac are so-called falling factorials (see Concrete // Mathematics, p. 47 for a definition). - // now, for tensor product bezier curves, the convex hull property // holds, too. Thus, we simply project the control points (t_{ij}, // u_{ij}, d_{ij}) onto the (t,d) plane and calculate the // intersections of the convex hull with the t axis, as for the // bezier clipping case. - // calc polygon of control points (t_{ij}, d_{ij}): const int n( 3 ); // cubic bezier curves, as a matter of fact @@ -900,8 +866,6 @@ bool Impl_calcSafeParams_focus( double& t1, #endif } - - /** Calc all values t_i on c1, for which safeRanges functor does not give a safe range on c1 and c2. @@ -1144,8 +1108,6 @@ template <class Functor> void Impl_applySafeRanges_rec( ::std::back_insert_itera } } - - struct ClipBezierFunctor { bool operator()( double& t1_c1, @@ -1159,8 +1121,6 @@ struct ClipBezierFunctor } }; - - struct BezierTangencyFunctor { bool operator()( double& t1_c1, @@ -1187,8 +1147,6 @@ struct BezierTangencyFunctor } }; - - /** Perform a bezier clip (curve against curve) @param result @@ -1476,7 +1434,6 @@ int main(int argc, const char *argv[]) << c1_part3.p2.y << "," << c1_part3.p3.y << ",t) title \"left " << i << "\""; - if( i+1<sizeof(someCurves)/sizeof(Bezier) ) cout << ",\\" << endl; else @@ -1575,7 +1532,6 @@ int main(int argc, const char *argv[]) << focus.p2.y << "," << focus.p3.y << ",t) title \"focus " << i << "\""; - if( i+1<sizeof(someCurves)/sizeof(Bezier) ) cout << ",\\" << endl; else diff --git a/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx index aba5c1a94b69..5c40efda2929 100644 --- a/basegfx/source/workbench/convexhull.cxx +++ b/basegfx/source/workbench/convexhull.cxx @@ -23,8 +23,6 @@ #include "bezierclip.hxx" - - /* Implements the theta function from Sedgewick: Algorithms in XXX, chapter 24 */ template <class PointType> double theta( const PointType& p1, const PointType& p2 ) { @@ -149,7 +147,6 @@ template <class PointType, class CmpFunctor> typename PointType::value_type ccw( single point can then be treated correctly. */ - /* Implementation of Graham's convex hull algorithm, see Sedgewick: Algorithms in XXX, chapter 25 */ Polygon2D convexHull( const Polygon2D& rPoly ) { diff --git a/basegfx/source/workbench/gauss.hxx b/basegfx/source/workbench/gauss.hxx index 160fe31522ad..b6a784cbfc6c 100644 --- a/basegfx/source/workbench/gauss.hxx +++ b/basegfx/source/workbench/gauss.hxx @@ -83,7 +83,6 @@ bool eliminate( Matrix& matrix, return true; } - /** Retrieve solution vector of linear system by substituting backwards. This operation _relies_ on the previous successful @@ -130,7 +129,6 @@ bool substitute( const Matrix& matrix, return true; } - /** This method determines solution of given linear system, if any This is a wrapper for eliminate and substitute, given matrix must diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 2eea4952adf9..9058956961c5 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -55,7 +55,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b1drange - CPPUNIT_TEST_SUITE_REGISTRATION(basegfx1d::b1drange); } // namespace basegfx1d diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index a7706fd13385..d9c3fe25fbb1 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -213,7 +213,6 @@ public: CPPUNIT_ASSERT_MESSAGE("exporting '@' to SVG-D (round-trip)", aExport.equalsAscii(sExportString1)); - CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D", tools::importFromSvgD( aPoly, aPath3, false, 0 )); aExport = tools::exportToSvgD( aPoly, true, true, false ); @@ -693,7 +692,6 @@ public: }; // class b2dhommatrix - class b2dpoint : public CppUnit::TestFixture { public: @@ -713,7 +711,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b2dpoint - class b2dpolygon : public CppUnit::TestFixture { public: @@ -779,7 +776,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b2dpolygon - class b2dpolygontools : public CppUnit::TestFixture { public: @@ -968,7 +964,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b1Xrange - class b1ibox : public CppUnit::TestFixture { public: @@ -1027,7 +1022,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b1ibox - class b2Xrange : public CppUnit::TestFixture { public: @@ -1067,7 +1061,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b2Xrange - class b2ibox : public CppUnit::TestFixture { public: @@ -1100,7 +1093,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b2ibox - class b2dtuple : public CppUnit::TestFixture { public: @@ -1284,8 +1276,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b2dvector - - CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dsvgdimpex); CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2drange); CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dpolyrange); @@ -1302,9 +1292,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::b2dtuple); CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::bcolor); } // namespace basegfx2d - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. // NOADDITIONAL; diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index 139eca0e70d9..73040bd39502 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -53,7 +53,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b3dhommatrix - class b3dpoint : public CppUnit::TestFixture { public: @@ -82,7 +81,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b3dpoint - class b3drange : public CppUnit::TestFixture { public: @@ -109,7 +107,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b3drange - class b3dtuple : public CppUnit::TestFixture { public: @@ -138,7 +135,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b3dtuple - class b3dvector : public CppUnit::TestFixture { public: @@ -165,7 +161,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class b3dvector - CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dhommatrix); CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dpoint); CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3drange); @@ -173,9 +168,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dtuple); CPPUNIT_TEST_SUITE_REGISTRATION(basegfx3d::b3dvector); } // namespace basegfx3d - - - // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. // NOADDITIONAL; diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx index e5a6a4932f2b..6dbc62654914 100644 --- a/basegfx/test/basegfxtools.cxx +++ b/basegfx/test/basegfxtools.cxx @@ -93,7 +93,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(basegfxtools::KeyStopLerpTest); } // namespace basegfxtools diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 57cbd3fad07d..7ce2acf719e9 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -57,7 +57,6 @@ inline bool compare(const B2DPoint& left, const B2DPoint& right) || (left.getX()==right.getX() && left.getY()<right.getY()); } - class boxclipper : public CppUnit::TestFixture { private: @@ -428,7 +427,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::boxclipper); } // namespace basegfx2d diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index ef41849715ea..b8213af61246 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -32,7 +32,6 @@ using namespace ::basegfx; - namespace basegfx2d { @@ -157,7 +156,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::clipstate); } // namespace basegfx2d diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index 8de9f368261d..6764a90b23eb 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -36,7 +36,6 @@ using namespace ::basegfx; - namespace basegfx2d { @@ -191,7 +190,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(basegfx2d::genericclipper); } // namespace basegfx2d |