diff options
author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /basegfx | |
parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/inc/basegfx/color/bcolormodifier.hxx | 4 | ||||
-rw-r--r-- | basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 2 | ||||
-rw-r--r-- | basegfx/inc/basegfx/polygon/b2dpolygontools.hxx | 2 | ||||
-rw-r--r-- | basegfx/inc/basegfx/range/rangeexpander.hxx | 2 | ||||
-rw-r--r-- | basegfx/inc/basegfx/tools/keystoplerp.hxx | 4 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygonclipper.cxx | 2 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygontools.cxx | 6 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dsvgpolypolygon.cxx | 8 | ||||
-rw-r--r-- | basegfx/source/raster/rasterconvert3d.cxx | 2 | ||||
-rw-r--r-- | basegfx/source/workbench/gauss.hxx | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/basegfx/inc/basegfx/color/bcolormodifier.hxx b/basegfx/inc/basegfx/color/bcolormodifier.hxx index 4009239b00c4..01659c47ccc6 100644 --- a/basegfx/inc/basegfx/color/bcolormodifier.hxx +++ b/basegfx/inc/basegfx/color/bcolormodifier.hxx @@ -61,12 +61,12 @@ namespace basegfx { private: protected: - // noone is allowed to incarnate the abstract base class + // no one is allowed to incarnate the abstract base class // except derivations BColorModifier() {} public: - // noone should directly destroy it; all incarnations should be + // no one should directly destroy it; all incarnations should be // handled in a boost::shared_ptr of type BColorModifierSharedPtr virtual ~BColorModifier(); diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx index 4b91efdce444..a00288d8e07f 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx @@ -112,7 +112,7 @@ namespace basegfx /** check edge for being a bezier segment - This test the existance of control vectors, but do not apply + This test the existence of control vectors, but do not apply testAndSolveTrivialBezier() to the bezier segment, so it is still useful to do so. Since it can use internal data representations, it is faster diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx index c853f26bbf7b..63dc4ac84ad8 100644 --- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx +++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx @@ -463,7 +463,7 @@ namespace basegfx @param fEnd The maximum distance for the last point. No more points behind this distance will be created. - Use 0.0 to proccess the whole polygon. Negative values are truncated to 0.0. It also + Use 0.0 to process the whole polygon. Negative values are truncated to 0.0. It also needs to be more or equal to fStart, else it is truncated to fStart. @return diff --git a/basegfx/inc/basegfx/range/rangeexpander.hxx b/basegfx/inc/basegfx/range/rangeexpander.hxx index fb260f6875cf..de28b0e0fb75 100644 --- a/basegfx/inc/basegfx/range/rangeexpander.hxx +++ b/basegfx/inc/basegfx/range/rangeexpander.hxx @@ -43,7 +43,7 @@ namespace basegfx in at the function operator. @tpl RangeType - Range type to operate with. Preferrably, one of B1*Range, + Range type to operate with. Preferably, one of B1*Range, B2*Range, or B3*Range. */ template< typename RangeType > class RangeExpander diff --git a/basegfx/inc/basegfx/tools/keystoplerp.hxx b/basegfx/inc/basegfx/tools/keystoplerp.hxx index 31c50a7b10fe..a98fbbe03637 100644 --- a/basegfx/inc/basegfx/tools/keystoplerp.hxx +++ b/basegfx/inc/basegfx/tools/keystoplerp.hxx @@ -56,7 +56,7 @@ namespace basegfx @param rKeyStops Vector of stops, must contain at least two elements - (though preferrably more, otherwise you probably don't + (though preferably more, otherwise you probably don't need key stop lerping in the first place). All elements must be of monotonically increasing value. */ @@ -67,7 +67,7 @@ namespace basegfx @param rKeyStops Sequence of stops, must contain at least two elements - (though preferrably more, otherwise you probably don't + (though preferably more, otherwise you probably don't need key stop lerping in the first place). All elements must be of monotonically increasing value. */ diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 7dd59d1fecae..39d7e8c9e436 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -808,7 +808,7 @@ namespace basegfx if(nIndex > 1) { - // consume vertices until a single seperate triangle has been visited. + // consume vertices until a single separate triangle has been visited. if(!((nIndex+1)%3)) { // if any of the last three vertices was outside diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 7afcfb358b07..8cdcc7fbe767 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -713,13 +713,13 @@ namespace basegfx { if(fTools::moreOrEqual(fDistance, fEdgeLength)) { - // end point of choosen edge + // end point of chosen edge const sal_uInt32 nNextIndex((nIndex + 1) % nPointCount); aRetval = rCandidate.getB2DPoint(nNextIndex); } else if(fTools::equalZero(fDistance)) { - // start point of choosen edge + // start point of chosen edge aRetval = aRetval; } else @@ -3419,7 +3419,7 @@ namespace basegfx } } - // substract length of current edge + // subtract length of current edge fPositionInEdge -= fEdgeLength; } diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index 05cb42004dba..12f05d2b595b 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -241,7 +241,7 @@ namespace basegfx nY += nLastY; } - // ensure existance of start point + // ensure existence of start point if(!aCurrPoly.count()) { aCurrPoly.append(B2DPoint(nLastX, nLastY)); @@ -305,7 +305,7 @@ namespace basegfx nY += nLastY; } - // ensure existance of start point + // ensure existence of start point if(!aCurrPoly.count()) { aCurrPoly.append(B2DPoint(nLastX, nLastY)); @@ -356,7 +356,7 @@ namespace basegfx const double nX2Prime((nX1 * 2.0 + nX) / 3.0); const double nY2Prime((nY1 * 2.0 + nY) / 3.0); - // ensure existance of start point + // ensure existence of start point if(!aCurrPoly.count()) { aCurrPoly.append(B2DPoint(nLastX, nLastY)); @@ -396,7 +396,7 @@ namespace basegfx nY += nLastY; } - // ensure existance of start point + // ensure existence of start point if(!aCurrPoly.count()) { aCurrPoly.append(B2DPoint(nLastX, nLastY)); diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx index a69157b80e6f..07ba306b2d00 100644 --- a/basegfx/source/raster/rasterconvert3d.cxx +++ b/basegfx/source/raster/rasterconvert3d.cxx @@ -118,7 +118,7 @@ namespace basegfx // sort current scanline using comparator. Only X is used there // since all entries are already in one processed line. This needs to be done - // everytime since not only new spans may have benn added or old removed, + // every time since not only new spans may have benn added or old removed, // but incrementing may also have changed the order ::std::sort(aCurrentLine.begin(), aCurrentLine.end(), lineComparator()); diff --git a/basegfx/source/workbench/gauss.hxx b/basegfx/source/workbench/gauss.hxx index 2e3b46bdb9d3..e290bb484394 100644 --- a/basegfx/source/workbench/gauss.hxx +++ b/basegfx/source/workbench/gauss.hxx @@ -102,7 +102,7 @@ bool eliminate( Matrix& matrix, Result vector. Given matrix must have space for one column (rows entries). @return true, if back substitution was possible (i.e. no division - by zero occured). + by zero occurred). */ template <class Matrix, class Vector, typename BaseType> bool substitute( const Matrix& matrix, |