diff options
author | Armin Weiss <aw@openoffice.org> | 2003-11-05 11:25:58 +0000 |
---|---|---|
committer | Armin Weiss <aw@openoffice.org> | 2003-11-05 11:25:58 +0000 |
commit | c3663a687ccc9365b2b4eb4a3950b8d94c2d6ea7 (patch) | |
tree | c47ce5e59d718d5f772121000a356ef523662b17 /basegfx/source/matrix | |
parent | 571971699571e0baf9710ddf076ebf27aebb548d (diff) |
Added PolyPolygonTools, Added PolygonTool functionality, changed bool to sal_Bool
Diffstat (limited to 'basegfx/source/matrix')
-rw-r--r-- | basegfx/source/matrix/b2dhommatrix.cxx | 36 | ||||
-rw-r--r-- | basegfx/source/matrix/b3dhommatrix.cxx | 34 |
2 files changed, 35 insertions, 35 deletions
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx index 005dac082664..f9b4b3e48554 100644 --- a/basegfx/source/matrix/b2dhommatrix.cxx +++ b/basegfx/source/matrix/b2dhommatrix.cxx @@ -2,9 +2,9 @@ * * $RCSfile: b2dhommatrix.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2003-10-31 10:13:55 $ + * last change: $Author: aw $ $Date: 2003-11-05 12:25:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,10 +146,10 @@ namespace basegfx mpM->set(nRow, nColumn, fValue); } - bool B2DHomMatrix::isIdentity() const + sal_Bool B2DHomMatrix::isIdentity() const { if(mpM == &get2DIdentityMatrix()) - return true; + return sal_True; return mpM->isIdentity(); } @@ -165,12 +165,12 @@ namespace basegfx mpM->incRefCount(); } - bool B2DHomMatrix::isInvertible() const + sal_Bool B2DHomMatrix::isInvertible() const { return mpM->isInvertible(); } - bool B2DHomMatrix::invert() + sal_Bool B2DHomMatrix::invert() { Impl2DHomMatrix aWork(*mpM); sal_uInt16* pIndex = new sal_uInt16[mpM->getEdgeLength()]; @@ -182,14 +182,14 @@ namespace basegfx mpM->doInvert(aWork, pIndex); delete pIndex; - return true; + return sal_True; } delete pIndex; - return false; + return sal_False; } - bool B2DHomMatrix::isNormalized() const + sal_Bool B2DHomMatrix::isNormalized() const { return mpM->isNormalized(); } @@ -272,18 +272,18 @@ namespace basegfx return *this; } - bool B2DHomMatrix::operator==(const B2DHomMatrix& rMat) const + sal_Bool B2DHomMatrix::operator==(const B2DHomMatrix& rMat) const { if(mpM == rMat.mpM) - return true; + return sal_True; return mpM->isEqual(*rMat.mpM); } - bool B2DHomMatrix::operator!=(const B2DHomMatrix& rMat) const + sal_Bool B2DHomMatrix::operator!=(const B2DHomMatrix& rMat) const { if(mpM == rMat.mpM) - return false; + return sal_False; return !mpM->isEqual(*rMat.mpM); } @@ -367,15 +367,15 @@ namespace basegfx } // Decomposition - bool B2DHomMatrix::decompose(tuple::B2DTuple& rScale, tuple::B2DTuple& rTranslate, double& rRotate, double& rShearX) const + sal_Bool B2DHomMatrix::decompose(tuple::B2DTuple& rScale, tuple::B2DTuple& rTranslate, double& rRotate, double& rShearX) const { // when perspective is used, decompose is not made here if(!mpM->isLastLineDefault()) - return false; + return sal_False; // If determinant is zero, decomposition is not possible if(0.0 == mpM->doDeterminant()) - return false; + return sal_False; // copy 2x2 matrix and translate vector to 3x3 matrix ::basegfx::matrix::B3DHomMatrix a3DHomMat; @@ -405,10 +405,10 @@ namespace basegfx rTranslate.setX(r3DTranslate.getX()); rTranslate.setY(r3DTranslate.getY()); - return true; + return sal_True; } - return false; + return sal_False; } } // end of namespace matrix } // end of namespace basegfx diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx index 939e952f796a..232ff46c7c77 100644 --- a/basegfx/source/matrix/b3dhommatrix.cxx +++ b/basegfx/source/matrix/b3dhommatrix.cxx @@ -2,9 +2,9 @@ * * $RCSfile: b3dhommatrix.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2003-10-31 10:13:55 $ + * last change: $Author: aw $ $Date: 2003-11-05 12:25:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,10 +138,10 @@ namespace basegfx mpM->set(nRow, nColumn, fValue); } - bool B3DHomMatrix::isIdentity() const + sal_Bool B3DHomMatrix::isIdentity() const { if(mpM == &get3DIdentityMatrix()) - return true; + return sal_True; return mpM->isIdentity(); } @@ -157,12 +157,12 @@ namespace basegfx mpM->incRefCount(); } - bool B3DHomMatrix::isInvertible() const + sal_Bool B3DHomMatrix::isInvertible() const { return mpM->isInvertible(); } - bool B3DHomMatrix::invert() + sal_Bool B3DHomMatrix::invert() { Impl3DHomMatrix aWork(*mpM); sal_uInt16* pIndex = new sal_uInt16[mpM->getEdgeLength()]; @@ -174,14 +174,14 @@ namespace basegfx mpM->doInvert(aWork, pIndex); delete pIndex; - return true; + return sal_True; } delete pIndex; - return false; + return sal_False; } - bool B3DHomMatrix::isNormalized() const + sal_Bool B3DHomMatrix::isNormalized() const { return mpM->isNormalized(); } @@ -264,18 +264,18 @@ namespace basegfx return *this; } - bool B3DHomMatrix::operator==(const B3DHomMatrix& rMat) const + sal_Bool B3DHomMatrix::operator==(const B3DHomMatrix& rMat) const { if(mpM == rMat.mpM) - return true; + return sal_True; return mpM->isEqual(*rMat.mpM); } - bool B3DHomMatrix::operator!=(const B3DHomMatrix& rMat) const + sal_Bool B3DHomMatrix::operator!=(const B3DHomMatrix& rMat) const { if(mpM == rMat.mpM) - return false; + return sal_False; return !mpM->isEqual(*rMat.mpM); } @@ -497,15 +497,15 @@ namespace basegfx mpM = new Impl3DHomMatrix(aOrthoMat); } - bool B3DHomMatrix::decompose(tuple::B3DTuple& rScale, tuple::B3DTuple& rTranslate, tuple::B3DTuple& rRotate, tuple::B3DTuple& rShear) const + sal_Bool B3DHomMatrix::decompose(tuple::B3DTuple& rScale, tuple::B3DTuple& rTranslate, tuple::B3DTuple& rRotate, tuple::B3DTuple& rShear) const { // when perspective is used, decompose is not made here if(!mpM->isLastLineDefault()) - return false; + return sal_False; // If determinant is zero, decomposition is not possible if(0.0 == mpM->doDeterminant()) - return false; + return sal_False; // isolate translation rTranslate.setX(mpM->get(0, 3)); @@ -631,7 +631,7 @@ namespace basegfx // corrcet rotate values rRotate.correctValues(); - return true; + return sal_True; } } // end of namespace matrix } // end of namespace basegfx |