diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:30:58 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:30:58 +0000 |
| commit | ce476c8daeb43b264afd1b4dc22b1eb8746813ab (patch) | |
| tree | e2d6df8f2ccdfd54ff1179e5aae572cf58668173 /svx/source/sdr/contact/viewcontactofgraphic.cxx | |
| parent | 1dc164e45cf7df4528c0dcd9977731b279e5c674 (diff) | |
INTEGRATION: CWS aw009 (1.2.196); FILE MERGED
2004/04/29 11:12:25 aw 1.2.196.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/28 12:05:01 aw 1.2.196.1: #115931#
Diffstat (limited to 'svx/source/sdr/contact/viewcontactofgraphic.cxx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofgraphic.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 6914a11b0c9a..b9620b2ef538 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewcontactofgraphic.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2003-11-24 16:45:11 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:30:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -393,6 +393,13 @@ namespace sdr // Decide if graphic should be painted as draft sal_Bool ViewContactOfGraphic::DoPaintGraphicDraft(DisplayInfo& rDisplayInfo) const { + // #115931# + // Take care for SDRPAINTMODE_DRAFTGRAF + if(rDisplayInfo.IsDraftGraphic()) + { + return sal_True; + } + SdrGrafObj& rGrafObj = GetGrafObject(); if(rGrafObj.IsSwappedOut()) @@ -557,6 +564,12 @@ namespace sdr sal_Bool ViewContactOfGraphic::SupportsAnimation() const { + // #116168# If object is in destruction, force animation support to sal_False + if(GetGrafObject().IsInDestruction()) + { + return sal_False; + } + // Is animation allowed? if(!GetGrafObject().IsGrafAnimationAllowed()) { |