summaryrefslogtreecommitdiff
path: root/basegfx/inc/basegfx/point
diff options
context:
space:
mode:
authorArmin Weiss <aw@openoffice.org>2003-12-03 08:24:28 +0000
committerArmin Weiss <aw@openoffice.org>2003-12-03 08:24:28 +0000
commit220242e6f73291c43fee24a53ff87e2ab39541c3 (patch)
treeee5f5af378b61f87e4e93dde9bbf75f37741aaab /basegfx/inc/basegfx/point
parent635458fe40f574ca8c325c14b8a7ea2ae261a86c (diff)
remaned min, max, abs to their longer names due to preprocessor expansions
Diffstat (limited to 'basegfx/inc/basegfx/point')
-rw-r--r--basegfx/inc/basegfx/point/b2dhompoint.hxx10
-rw-r--r--basegfx/inc/basegfx/point/b3dhompoint.hxx10
2 files changed, 10 insertions, 10 deletions
diff --git a/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx
index 911e61a884fd..ca5fdb9fb9b0 100644
--- a/basegfx/inc/basegfx/point/b2dhompoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dhompoint.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: b2dhompoint.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: aw $ $Date: 2003-11-28 11:17:51 $
+ * last change: $Author: aw $ $Date: 2003-12-03 09:24:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -243,11 +243,11 @@ namespace basegfx
// external operators
//////////////////////////////////////////////////////////////////////////
- B2DHomPoint min(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+ B2DHomPoint minimum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
- B2DHomPoint max(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
+ B2DHomPoint maximum(const B2DHomPoint& rVecA, const B2DHomPoint& rVecB);
- B2DHomPoint abs(const B2DHomPoint& rVec);
+ B2DHomPoint absolute(const B2DHomPoint& rVec);
B2DHomPoint interpolate(B2DHomPoint& rOld1, B2DHomPoint& rOld2, double t);
diff --git a/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx
index 08079b90a983..2366ea578d70 100644
--- a/basegfx/inc/basegfx/point/b3dhompoint.hxx
+++ b/basegfx/inc/basegfx/point/b3dhompoint.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: b3dhompoint.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: aw $ $Date: 2003-11-28 11:17:51 $
+ * last change: $Author: aw $ $Date: 2003-12-03 09:24:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -343,7 +343,7 @@ namespace basegfx
// external operators
//////////////////////////////////////////////////////////////////////////
- inline B3DHomPoint min(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+ inline B3DHomPoint minimum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
{
B3DHomPoint aMin(
(rVecB.getX() < rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
@@ -352,7 +352,7 @@ namespace basegfx
return aMin;
}
- inline B3DHomPoint max(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
+ inline B3DHomPoint maximum(const B3DHomPoint& rVecA, const B3DHomPoint& rVecB)
{
B3DHomPoint aMax(
(rVecB.getX() > rVecA.getX()) ? rVecB.getX() : rVecA.getX(),
@@ -361,7 +361,7 @@ namespace basegfx
return aMax;
}
- inline B3DHomPoint abs(const B3DHomPoint& rVec)
+ inline B3DHomPoint absolute(const B3DHomPoint& rVec)
{
B3DHomPoint aAbs(
(0.0 > rVec.getX()) ? -rVec.getX() : rVec.getX(),