summaryrefslogtreecommitdiff
path: root/basegfx/source/inc
diff options
context:
space:
mode:
authorThorsten Behrens <thb@openoffice.org>2004-01-16 09:34:43 +0000
committerThorsten Behrens <thb@openoffice.org>2004-01-16 09:34:43 +0000
commitfb6fefbd9482f6fa26447be417286ae1935c0702 (patch)
treedf3b1b957f17a5f70a83b705865b4c1291b1f382 /basegfx/source/inc
parent08761ff6d5991730ed66b7e13817b325ce848da3 (diff)
#110496# Added integer point, size and rectangle classes, needed for the new canvas
Diffstat (limited to 'basegfx/source/inc')
-rw-r--r--basegfx/source/inc/PolygonPoint.hxx50
-rw-r--r--basegfx/source/inc/hommatrixtemplate.hxx48
-rw-r--r--basegfx/source/inc/polygontemplate.hxx50
3 files changed, 74 insertions, 74 deletions
diff --git a/basegfx/source/inc/PolygonPoint.hxx b/basegfx/source/inc/PolygonPoint.hxx
index 2d8a7c164d09..dfd4654fd234 100644
--- a/basegfx/source/inc/PolygonPoint.hxx
+++ b/basegfx/source/inc/PolygonPoint.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: PolygonPoint.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: aw $ $Date: 2003-11-26 14:32:41 $
+ * last change: $Author: thb $ $Date: 2004-01-16 10:34:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,7 +91,7 @@ public:
maPoint = rValue;
}
- sal_Bool operator==(const SimplePointEntry& rEntry) const
+ bool operator==(const SimplePointEntry& rEntry) const
{
return (maPoint == rEntry.maPoint);
}
@@ -137,14 +137,14 @@ public:
maForward = rValue;
}
- sal_Bool isBezierNeeded()
+ bool isBezierNeeded()
{
if(maBackward != Vector::getEmptyVector() || maForward != Vector::getEmptyVector())
- return sal_True;
- return sal_False;
+ return true;
+ return false;
}
- sal_Bool operator==(const SimpleBezierEntry& rEntry) const
+ bool operator==(const SimpleBezierEntry& rEntry) const
{
return ((maBackward == rEntry.maBackward) && (maForward == rEntry.maForward));
}
@@ -181,17 +181,17 @@ template < class Point, class Vector > class PolygonPointList
}
public:
- sal_Bool isBezier() const
+ bool isBezier() const
{
- return sal_Bool(mnBezierCount);
+ return bool(mnBezierCount);
}
- sal_Bool isClosed() const
+ bool isClosed() const
{
- return sal_Bool(mbIsClosed);
+ return bool(mbIsClosed);
}
- void setClosed(sal_Bool bNew)
+ void setClosed(bool bNew)
{
mbIsClosed = bNew;
}
@@ -204,7 +204,7 @@ public:
PolygonPointList()
: mnBezierCount(0L),
mpVectors(0L),
- mbIsClosed(sal_False)
+ mbIsClosed(false)
{
// complete initialization with defaults
}
@@ -276,27 +276,27 @@ public:
}
}
- sal_Bool isEqual(const PolygonPointList& rPointList) const
+ bool isEqual(const PolygonPointList& rPointList) const
{
// same point count?
if(maPoints.size() != rPointList.maPoints.size())
- return sal_False;
+ return false;
// if zero points the polys are equal
if(!maPoints.size())
- return sal_True;
+ return true;
// if bezier count used it needs to be equal
if(mnBezierCount != rPointList.mnBezierCount)
- return sal_False;
+ return false;
// compare point content
if(maPoints != rPointList.maPoints)
- return sal_False;
+ return false;
// beziercounts are equal: if it's zero, we are done
if(!mnBezierCount)
- return sal_True;
+ return true;
// beziercounts are equal and not zero; compare them
OSL_ENSURE(0L != mpVectors, "Error: Bezier list needs to exist here(!)");
@@ -328,9 +328,9 @@ public:
if(mpVectors)
{
LocalSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
- sal_Bool bBezierNeededBefore(rDest.isBezierNeeded());
+ bool bBezierNeededBefore(rDest.isBezierNeeded());
((*mpVectors)[nIndex]).setBackwardVector(rValue);
- sal_Bool bBezierNeededAfter(rDest.isBezierNeeded());
+ bool bBezierNeededAfter(rDest.isBezierNeeded());
if(bBezierNeededBefore != bBezierNeededAfter)
{
@@ -342,7 +342,7 @@ public:
}
else
{
- sal_Bool bEmptyVector(rValue == Vector::getEmptyVector());
+ bool bEmptyVector(rValue == Vector::getEmptyVector());
if(bEmptyVector)
return;
@@ -366,9 +366,9 @@ public:
if(mpVectors)
{
LocalSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
- sal_Bool bBezierNeededBefore(rDest.isBezierNeeded());
+ bool bBezierNeededBefore(rDest.isBezierNeeded());
((*mpVectors)[nIndex]).setForwardVector(rValue);
- sal_Bool bBezierNeededAfter(rDest.isBezierNeeded());
+ bool bBezierNeededAfter(rDest.isBezierNeeded());
if(bBezierNeededBefore != bBezierNeededAfter)
{
@@ -380,7 +380,7 @@ public:
}
else
{
- sal_Bool bEmptyVector(rValue == Vector::getEmptyVector());
+ bool bEmptyVector(rValue == Vector::getEmptyVector());
if(bEmptyVector)
return;
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index 4c688b09a218..4c4b1ad10b07 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hommatrixtemplate.hxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: aw $ $Date: 2003-11-28 11:18:02 $
+ * last change: $Author: thb $ $Date: 2004-01-16 10:34:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -129,10 +129,10 @@ namespace basegfx
public:
// Is last line used?
- sal_Bool isLastLineDefault() const
+ bool isLastLineDefault() const
{
if(!mpLine)
- return sal_True;
+ return true;
for(sal_uInt16 a(0); a < RowSize; a++)
{
@@ -141,7 +141,7 @@ namespace basegfx
if(!::basegfx::fTools::equal(fDefault, fLineValue))
{
- return sal_False;
+ return false;
}
}
@@ -149,7 +149,7 @@ namespace basegfx
delete ((ImplHomMatrixTemplate< RowSize >*)this)->mpLine;
((ImplHomMatrixTemplate< RowSize >*)this)->mpLine = 0L;
- return sal_True;
+ return true;
}
// This constructor is only used form the static identity matrix, thus
@@ -238,7 +238,7 @@ namespace basegfx
{
if(mpLine)
{
- sal_Bool bNecessary(sal_False);
+ bool bNecessary(false);
for(sal_uInt16 a(0);!bNecessary && a < RowSize; a++)
{
@@ -247,7 +247,7 @@ namespace basegfx
if(!::basegfx::fTools::equal(fDefault, fLineValue))
{
- bNecessary = sal_True;
+ bNecessary = true;
}
}
@@ -260,7 +260,7 @@ namespace basegfx
}
// Left-upper decompositon
- sal_Bool ludcmp(sal_uInt16 nIndex[], sal_Int16& nParity)
+ bool ludcmp(sal_uInt16 nIndex[], sal_Int16& nParity)
{
double fBig, fSum, fDum;
double fStorage[RowSize];
@@ -286,7 +286,7 @@ namespace basegfx
if(::basegfx::fTools::equalZero(fBig))
{
- return sal_False;
+ return false;
}
fStorage[a] = 1.0 / fBig;
@@ -348,7 +348,7 @@ namespace basegfx
if(::basegfx::fTools::equalZero(fValBB))
{
- return sal_False;
+ return false;
}
if(b != (RowSize - 1))
@@ -362,7 +362,7 @@ namespace basegfx
}
}
- return sal_True;
+ return true;
}
void lubksb(const sal_uInt16 nIndex[], double fRow[]) const
@@ -410,7 +410,7 @@ namespace basegfx
}
}
- sal_Bool isIdentity() const
+ bool isIdentity() const
{
// last line needs no testing if not existing
const sal_uInt16 nMaxLine = (mpLine) ? RowSize : (RowSize - 1);
@@ -424,15 +424,15 @@ namespace basegfx
if(!::basegfx::fTools::equal(fDefault, fValueAB))
{
- return sal_False;
+ return false;
}
}
}
- return sal_True;
+ return true;
}
- sal_Bool isInvertible() const
+ bool isInvertible() const
{
ImplHomMatrixTemplate aWork(*this);
sal_uInt16 nIndex[RowSize];
@@ -441,26 +441,26 @@ namespace basegfx
return aWork.ludcmp(nIndex, nParity);
}
- sal_Bool isNormalized() const
+ bool isNormalized() const
{
if(!mpLine)
- return sal_True;
+ return true;
const double fHomValue(get((RowSize - 1), (RowSize - 1)));
if(::basegfx::fTools::equalZero(fHomValue))
{
- return sal_True;
+ return true;
}
const double fOne(1.0);
if(::basegfx::fTools::equal(fOne, fHomValue))
{
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
void doInvert(const ImplHomMatrixTemplate& rWork, const sal_uInt16 nIndex[])
@@ -623,7 +623,7 @@ namespace basegfx
testLastLine();
}
- sal_Bool isEqual(const ImplHomMatrixTemplate& rMat)
+ bool isEqual(const ImplHomMatrixTemplate& rMat)
{
const sal_uInt16 nMaxLine = (mpLine || rMat.mpLine) ? RowSize : (RowSize - 1);
@@ -636,12 +636,12 @@ namespace basegfx
if(!::basegfx::fTools::equal(fValueA, fValueB))
{
- return sal_False;
+ return false;
}
}
}
- return sal_True;
+ return true;
}
};
diff --git a/basegfx/source/inc/polygontemplate.hxx b/basegfx/source/inc/polygontemplate.hxx
index 310706bb461d..1639c5070622 100644
--- a/basegfx/source/inc/polygontemplate.hxx
+++ b/basegfx/source/inc/polygontemplate.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: polygontemplate.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: aw $ $Date: 2003-11-26 14:32:41 $
+ * last change: $Author: thb $ $Date: 2004-01-16 10:34:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,7 +91,7 @@ public:
maPoint = rValue;
}
- sal_Bool operator==(const ImplSimplePointEntry& rEntry) const
+ bool operator==(const ImplSimplePointEntry& rEntry) const
{
return (maPoint == rEntry.maPoint);
}
@@ -137,14 +137,14 @@ public:
maForward = rValue;
}
- sal_Bool isBezierNeeded()
+ bool isBezierNeeded()
{
if(!maBackward.equalZero() || !maForward.equalZero())
- return sal_True;
- return sal_False;
+ return true;
+ return false;
}
- sal_Bool operator==(const ImplSimpleBezierEntry& rEntry) const
+ bool operator==(const ImplSimpleBezierEntry& rEntry) const
{
return ((maBackward == rEntry.maBackward) && (maForward == rEntry.maForward));
}
@@ -181,17 +181,17 @@ template < class Point, class Vector > class ImplPolygonTemplate
}
public:
- sal_Bool isBezier() const
+ bool isBezier() const
{
- return sal_Bool(mnBezierCount);
+ return bool(mnBezierCount);
}
- sal_Bool isClosed() const
+ bool isClosed() const
{
- return sal_Bool(mbIsClosed);
+ return bool(mbIsClosed);
}
- void setClosed(sal_Bool bNew)
+ void setClosed(bool bNew)
{
mbIsClosed = bNew;
}
@@ -204,7 +204,7 @@ public:
ImplPolygonTemplate()
: mnBezierCount(0L),
mpVectors(0L),
- mbIsClosed(sal_False)
+ mbIsClosed(false)
{
// complete initialization with defaults
}
@@ -276,27 +276,27 @@ public:
}
}
- sal_Bool isEqual(const ImplPolygonTemplate& rPointList) const
+ bool isEqual(const ImplPolygonTemplate& rPointList) const
{
// same point count?
if(maPoints.size() != rPointList.maPoints.size())
- return sal_False;
+ return false;
// if zero points the polys are equal
if(!maPoints.size())
- return sal_True;
+ return true;
// if bezier count used it needs to be equal
if(mnBezierCount != rPointList.mnBezierCount)
- return sal_False;
+ return false;
// compare point content
if(maPoints != rPointList.maPoints)
- return sal_False;
+ return false;
// beziercounts are equal: if it's zero, we are done
if(!mnBezierCount)
- return sal_True;
+ return true;
// beziercounts are equal and not zero; compare them
OSL_ENSURE(0L != mpVectors, "Error: Bezier list needs to exist here(!)");
@@ -328,9 +328,9 @@ public:
if(mpVectors)
{
LocalImplSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
- sal_Bool bBezierNeededBefore(rDest.isBezierNeeded());
+ bool bBezierNeededBefore(rDest.isBezierNeeded());
((*mpVectors)[nIndex]).setBackwardVector(rValue);
- sal_Bool bBezierNeededAfter(rDest.isBezierNeeded());
+ bool bBezierNeededAfter(rDest.isBezierNeeded());
if(bBezierNeededBefore != bBezierNeededAfter)
{
@@ -342,7 +342,7 @@ public:
}
else
{
- sal_Bool bEmptyVector(rValue.equalZero());
+ bool bEmptyVector(rValue.equalZero());
if(bEmptyVector)
return;
@@ -366,9 +366,9 @@ public:
if(mpVectors)
{
LocalImplSimpleBezierEntry& rDest = (*mpVectors)[nIndex];
- sal_Bool bBezierNeededBefore(rDest.isBezierNeeded());
+ bool bBezierNeededBefore(rDest.isBezierNeeded());
((*mpVectors)[nIndex]).setForwardVector(rValue);
- sal_Bool bBezierNeededAfter(rDest.isBezierNeeded());
+ bool bBezierNeededAfter(rDest.isBezierNeeded());
if(bBezierNeededBefore != bBezierNeededAfter)
{
@@ -380,7 +380,7 @@ public:
}
else
{
- sal_Bool bEmptyVector(rValue.equalZero());
+ bool bEmptyVector(rValue.equalZero());
if(bEmptyVector)
return;