diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2003-11-24 16:09:43 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2003-11-24 16:09:43 +0000 |
commit | a077dac03dbd494ec07c8ef591a9b148c14b6cfb (patch) | |
tree | 5959167361b38f44e5fe2bb94ba0869a6bfa9d71 /sd/source/ui/dlg/animobjs.cxx | |
parent | 4e9e420714a7fd1215f3b2a4831c4c8793fffc4b (diff) |
INTEGRATION: CWS aw003 (1.12.120); FILE MERGED
2003/10/23 14:42:03 aw 1.12.120.3: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/07 11:28:03 aw 1.12.120.2: #111097#
2003/07/25 16:18:32 aw 1.12.120.1: #110094#
Changed Paint calls on objects to DoPaintObject to identify such cases
Diffstat (limited to 'sd/source/ui/dlg/animobjs.cxx')
-rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 603feca7d8a6..d03b58d0a8dc 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: animobjs.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: cl $ $Date: 2002-08-30 11:25:06 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:09:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -608,7 +608,7 @@ void SdAnimationWin::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) { SdrPaintInfoRec aPaintInfoRec; VirtualDevice aVD; - Rectangle aObjRect( pObject->GetBoundRect() ); + Rectangle aObjRect( pObject->GetCurrentBoundRect() ); Size aObjSize( aObjRect.GetSize() ); Point aOrigin( Point( -aObjRect.Left(), -aObjRect.Top() ) ); MapMode aMap( aVD.GetMapMode() ); @@ -622,7 +622,7 @@ void SdAnimationWin::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) ExtOutputDevice aOut( &aVD ); aVD.SetDrawMode( GetDisplayBackground().GetColor().IsDark() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); aVD.Erase(); - pObject->Paint( aOut, aPaintInfoRec ); + pObject->SingleObjectPainter( aOut, aPaintInfoRec ); // #110094#-17 aBmp = BitmapEx( aVD.GetBitmap( aObjRect.TopLeft(), aObjSize ) ); } |