diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:30:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:30:39 +0000 |
| commit | 1dc164e45cf7df4528c0dcd9977731b279e5c674 (patch) | |
| tree | 6a4d2c8f90efd56808793af58f97c2a21617c196 /svx/source/sdr/contact/viewcontact.cxx | |
| parent | ba6ffaf25a907603a7fdc13ff45c80036271bbc5 (diff) | |
INTEGRATION: CWS aw009 (1.3.76); FILE MERGED
2004/04/29 11:12:23 aw 1.3.76.2: #116168#
Changed ViewContact::ActionRemoved() to not call ViewContact::ActionChanged(). That call would again setup e.g. AnimationInfos which may fail due to models in destruction. Also expanded ::SupportsAnimation() implementations to always take care of SdrObject::IsInDestruction().
2004/04/26 11:44:56 aw 1.3.76.1: #116235#, #116168#
Diffstat (limited to 'svx/source/sdr/contact/viewcontact.cxx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontact.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 365c663a92ba..2d367bba5aca 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewcontact.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: kz $ $Date: 2004-02-26 17:46:53 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:30:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -297,8 +297,16 @@ namespace sdr delete pCandidate; } - // Use ActionChanged here since this has changed this object, too - ActionChanged(); + // #116168# get rid of animation info, too + if(HasAnimationInfo()) + { + DeleteAnimationInfo(); + } + + // #116168# Do not call ActionChanged(), this would again initialize e.g. + // the AnimationInfo. Just do what ActionChanged() does. + // Invalidate the PaintRectangle, this has changed now, too. + InvalidatePaintRectangle(); } // React on insertion of the object of this ViewContact, |