diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 15:00:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 15:00:10 +0000 |
| commit | a86758d5d3e89edb33180bc5e5413cf0796ba796 (patch) | |
| tree | b9af4963998c4b946ae7b596431951e9da5c41b4 /sw/source/core/access/accfrmobj.hxx | |
| parent | 27c87c3915a614bb7a8e1dfabbd3acef316690a6 (diff) | |
INTEGRATION: CWS aw003 (1.9.6); FILE MERGED
2003/10/23 14:39:17 aw 1.9.6.2: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/06/30 13:38:14 aw 1.9.6.1: #110094#
Diffstat (limited to 'sw/source/core/access/accfrmobj.hxx')
| -rw-r--r-- | sw/source/core/access/accfrmobj.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx index 081661523bd9..38958512c952 100644 --- a/sw/source/core/access/accfrmobj.hxx +++ b/sw/source/core/access/accfrmobj.hxx @@ -2,9 +2,9 @@ * * $RCSfile: accfrmobj.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2003-04-17 10:09:12 $ + * last change: $Author: rt $ $Date: 2003-11-24 16:00:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,8 @@ public: inline void SwFrmOrObj::Init( const SdrObject *pO ) { pObj = pO; - pFrm = pObj && pObj->IsWriterFlyFrame() + // #110094#-1 + pFrm = pObj && pObj->ISA(SwVirtFlyDrawObj) ? static_cast < const SwVirtFlyDrawObj * >( pObj )->GetFlyFrm() : 0; } @@ -246,7 +247,7 @@ inline SwRect SwFrmOrObj::GetBox() const return pFrm->Frm(); } else if( pObj ) - return SwRect( pObj->GetBoundRect() ); + return SwRect( pObj->GetCurrentBoundRect() ); else return SwRect(); @@ -266,7 +267,7 @@ inline SwRect SwFrmOrObj::GetBounds() const return pFrm->PaintArea(); } else if( pObj ) - return SwRect( pObj->GetBoundRect() ); + return SwRect( pObj->GetCurrentBoundRect() ); } |