diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:25:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 23:25:45 +0000 |
| commit | f4e00e15ffcb06dbdb5f9750280e519f7ee204ea (patch) | |
| tree | 21b74eda0a2dc4179ef3c346c7fc25b4cb36d3e5 /sw/inc/dcontact.hxx | |
| parent | 09f81f90e661d76580d02ca25e12484ac4559f82 (diff) | |
INTEGRATION: CWS aw033 (1.25.76); FILE MERGED
2008/06/24 15:36:16 aw 1.25.76.4: #i39532# corrections
2008/05/14 14:58:10 aw 1.25.76.3: RESYNC: (1.25-1.26); FILE MERGED
2008/01/22 12:22:04 aw 1.25.76.2: adaptions and 1st stripping
2007/12/19 12:50:31 aw 1.25.76.1: #i39532# support primitive-based visualisation of SwDrawVirtObj
Diffstat (limited to 'sw/inc/dcontact.hxx')
| -rw-r--r-- | sw/inc/dcontact.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 6ffc817200ab..9d33932f0440 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dcontact.hxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.27 $ * * This file is part of OpenOffice.org. * @@ -286,7 +286,6 @@ public: virtual void GetAnchoredObjs( std::vector<SwAnchoredObject*>& _roAnchoredObjs ) const; }; - // OD 16.05.2003 #108784# - new class for re-direct methods calls at a 'virtual' // drawing object to its referenced object. class SwDrawVirtObj : public SdrVirtObj @@ -304,7 +303,13 @@ class SwDrawVirtObj : public SdrVirtObj using SdrVirtObj::GetPlusHdl; - public: + private: + // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is + // not used but something own (top left of new SnapRect minus top left + // of original SnapRect) + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + + public: TYPEINFO(); SwDrawVirtObj( SdrObject& _rNewObj, @@ -338,10 +343,7 @@ class SwDrawVirtObj : public SdrVirtObj // #108784# // All overloaded methods which need to use the offset - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetLastBoundRect() const; virtual void RecalcBoundRect(); - virtual sal_Bool DoPaintObject(XOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec) const; virtual SdrObject* CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const; virtual ::basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const; virtual ::basegfx::B2DPolyPolygon TakeContour() const; |