diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 11:35:14 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 11:35:14 +0000 |
| commit | a7f3afc53483c4f8ff419c83401abc34d4add257 (patch) | |
| tree | f0aad1c1a6cf029717b5fd31bdd02c7a8051dd1c /svx | |
| parent | 8f3959f59d3137f548a22e28528b8bfb2b3faa89 (diff) | |
INTEGRATION: CWS aw024 (1.2.138); FILE MERGED
2006/11/10 02:47:11 aw 1.2.138.6: RESYNC: (1.3-1.4); FILE MERGED
2006/10/27 12:13:18 aw 1.2.138.5: #i39528# ::basegfx -> basegfx adaption
2005/09/17 23:47:08 aw 1.2.138.4: RESYNC: (1.2-1.3); FILE MERGED
2005/05/19 12:29:28 aw 1.2.138.3: #i39529#
2005/04/26 15:03:07 aw 1.2.138.2: #i39528#
2004/12/23 16:50:25 aw 1.2.138.1: #i39525
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/dragmt3d.hxx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 27851e056a33..b4e566216515 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: dragmt3d.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-10-12 11:39:58 $ + * last change: $Author: ihi $ $Date: 2006-11-14 12:35:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,8 +44,8 @@ #include "view3d.hxx" #endif -#ifndef _POLY3D_HXX -#include "poly3d.hxx" +#ifndef _BGFX_POLYGON_B3DPOLYGON_HXX +#include <basegfx/polygon/b3dpolygon.hxx> #endif #ifndef _SV_TIMER_HXX @@ -64,11 +64,11 @@ class E3dDragMethodUnit { public: E3dObject* p3DObj; - Polygon3D aWireframePoly; - Matrix4D aDisplayTransform; - Matrix4D aInvDisplayTransform; - Matrix4D aInitTransform; - Matrix4D aTransform; + basegfx::B3DPolygon aWireframePoly; + basegfx::B3DHomMatrix aDisplayTransform; + basegfx::B3DHomMatrix aInvDisplayTransform; + basegfx::B3DHomMatrix aInitTransform; + basegfx::B3DHomMatrix aTransform; INT32 nStartAngle; INT32 nLastAngle; @@ -97,7 +97,6 @@ class E3dDragMethod : public SdrDragMethod protected: E3dDragMethodUnitGroup aGrp; E3dDragConstraint eConstraint; - //BFS01E3dDragDetail eDragDetail; Point aLastPos; Rectangle aFullBound; BOOL bMoveFull; @@ -108,7 +107,6 @@ public: TYPEINFO(); E3dDragMethod(SdrDragView &rView, const SdrMarkList& rMark, - //BFS01E3dDragDetail eDetail, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, BOOL bFull=FALSE); @@ -119,10 +117,13 @@ public: virtual void Brk(); virtual FASTBOOL End(FASTBOOL bCopy); - virtual void DrawXor(XOutputDevice& rXOut, FASTBOOL bFull) const; + //virtual void DrawXor(XOutputDevice& rXOut, FASTBOOL bFull) const; E3dView& Get3DView() { return (E3dView&)rView; } DECL_LINK(TimerInterruptHdl, void*); + + // for migration from XOR to overlay + virtual void CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager, ::sdr::overlay::OverlayObjectList& rOverlayList); }; @@ -134,13 +135,12 @@ public: class E3dDragRotate : public E3dDragMethod { - Vector3D aGlobalCenter; + basegfx::B3DPoint aGlobalCenter; public: TYPEINFO(); E3dDragRotate(SdrDragView &rView, const SdrMarkList& rMark, - //BFS01E3dDragDetail eDetail, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, BOOL bFull=FALSE); @@ -164,7 +164,6 @@ public: TYPEINFO(); E3dDragMove(SdrDragView &rView, const SdrMarkList& rMark, - //BFS01E3dDragDetail eDetail, SdrHdlKind eDrgHdl = HDL_MOVE, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, BOOL bFull=FALSE); |