Kaydet (Commit) 4e459f3d authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS swqbf88 (1.19.26); FILE MERGED

2006/10/05 09:26:32 od 1.19.26.1: #i70122# classes <SwAnchoredDrawObject> and <SwFlyFrm>
	 - new method <GetObjBoundRect()>
üst 1ff704b1
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: anchoreddrawobject.cxx,v $ * $RCSfile: anchoreddrawobject.cxx,v $
* *
* $Revision: 1.19 $ * $Revision: 1.20 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 21:16:07 $ * last change: $Author: vg $ $Date: 2006-11-01 15:12:14 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -580,6 +580,9 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout() ...@@ -580,6 +580,9 @@ void SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout()
const Point aNewAnchorPos = const Point aNewAnchorPos =
GetAnchorFrm()->GetFrmAnchorPos( ::HasWrap( GetDrawObj() ) ); GetAnchorFrm()->GetFrmAnchorPos( ::HasWrap( GetDrawObj() ) );
DrawObj()->SetAnchorPos( aNewAnchorPos ); DrawObj()->SetAnchorPos( aNewAnchorPos );
// --> OD 2006-10-05 #i70122# - missing invalidation
InvalidateObjRectWithSpaces();
// <--
} }
// <-- // <--
SetCurrRelPos( aObjPositioning.GetRelPos() ); SetCurrRelPos( aObjPositioning.GetRelPos() );
...@@ -607,6 +610,9 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor() ...@@ -607,6 +610,9 @@ void SwAnchoredDrawObject::_SetDrawObjAnchor()
DrawObj()->SetAnchorPos( aNewAnchorPos ); DrawObj()->SetAnchorPos( aNewAnchorPos );
// correct object position, caused by setting new anchor position // correct object position, caused by setting new anchor position
DrawObj()->Move( aMove ); DrawObj()->Move( aMove );
// --> OD 2006-10-05 #i70122# - missing invalidation
InvalidateObjRectWithSpaces();
// <--
} }
} }
...@@ -725,6 +731,13 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const ...@@ -725,6 +731,13 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const
return GetDrawObj()->GetSnapRect(); return GetDrawObj()->GetSnapRect();
} }
// --> OD 2006-10-05 #i70122#
const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
{
return GetDrawObj()->GetCurrentBoundRect();
}
// <--
// --> OD 2006-08-10 #i68520# // --> OD 2006-08-10 #i68520#
const bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop ) const bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment