diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:33:57 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:33:57 +0000 |
commit | dbd7f1ca114c7b45cf3808c6667e156257b35949 (patch) | |
tree | bce5480916dd367b18bf38b328b10c9bc00eb3f2 /sd/source/ui/inc/fumorph.hxx | |
parent | 92d5e57a84572c9adae8c6ec21fe56ae0e3d2f6a (diff) |
INTEGRATION: CWS aw024 (1.2.310); FILE MERGED
2006/01/26 20:04:59 aw 1.2.310.3: RESYNC: (1.3-1.4); FILE MERGED
2005/09/17 12:32:14 aw 1.2.310.2: RESYNC: (1.2-1.3); FILE MERGED
2005/04/26 14:58:39 aw 1.2.310.1: #i39528#
Diffstat (limited to 'sd/source/ui/inc/fumorph.hxx')
-rw-r--r-- | sd/source/ui/inc/fumorph.hxx | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 27741b68d77f..197ef5ecd30f 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fumorph.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-12-14 17:13:27 $ + * last change: $Author: ihi $ $Date: 2006-11-14 14:33:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,9 +46,11 @@ |* \************************************************************************/ class List; -class PolyPolygon3D; -class Polygon3D; -class Vector3D; +namespace basegfx { + class B2DPolyPolygon; + class B2DPolygon; + class B2DPoint; +} namespace sd { @@ -71,16 +73,16 @@ private: void ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2); - PolyPolygon3D* ImpCreateMorphedPolygon( - const PolyPolygon3D& rPolyPolyStart, - const PolyPolygon3D& rPolyPolyEnd, - const double fMorphingFactor); - BOOL ImpMorphPolygons( - const PolyPolygon3D& rPolyPoly1, const PolyPolygon3D& rPolyPoly2, - const USHORT nSteps, List& rPolyPolyList3D); - void ImpAddPolys(PolyPolygon3D& rSmaller, const PolyPolygon3D& rBigger); - void ImpEqualizePolyPointCount(Polygon3D& rSmall, const Polygon3D& rBig); - sal_uInt16 ImpGetNearestIndex(const Polygon3D& rPoly, const Vector3D& rPos); + ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( + const ::basegfx::B2DPolyPolygon& rPolyPolyStart, + const ::basegfx::B2DPolyPolygon& rPolyPolyEnd, + double fMorphingFactor); + sal_Bool ImpMorphPolygons( + const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, + const sal_uInt16 nSteps, List& rPolyPolyList3D); + void ImpAddPolys(::basegfx::B2DPolyPolygon& rSmaller, const ::basegfx::B2DPolyPolygon& rBigger); + void ImpEqualizePolyPointCount(::basegfx::B2DPolygon& rSmall, const ::basegfx::B2DPolygon& rBig); + sal_uInt32 ImpGetNearestIndex(const ::basegfx::B2DPolygon& rPoly, const ::basegfx::B2DPoint& rPos); }; } // end of namespace sd |