diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 13:32:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 13:32:50 +0000 |
| commit | 5efdd9f7c4cc231ed76bb9e686131729fc329006 (patch) | |
| tree | 40bea917c0753fb8f407c654508606163a52c8ee /sd/source/ui/unoidl/unoobj.cxx | |
| parent | 93195345df09bcfd8a551d9ddafe960b43280c1d (diff) | |
INTEGRATION: CWS impresspresobjs (1.51.16); FILE MERGED
2005/11/24 12:35:41 cl 1.51.16.1: #123595# new way of getting shape user data
Diffstat (limited to 'sd/source/ui/unoidl/unoobj.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 1ae3cd79da63..b43e4b8f16f5 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoobj.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: rt $ $Date: 2005-10-19 12:27:20 $ + * last change: $Author: rt $ $Date: 2006-01-10 14:32:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -899,20 +899,9 @@ SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const throw() { SdAnimationInfo* pInfo = NULL; - SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL; - if(pDoc) - { - SdrObject* pObj = mpShape->GetSdrObject(); - if(pObj) - { - pInfo = pDoc->GetAnimationInfo(pObj); - if( pInfo == NULL && bCreate ) - { - pInfo = new SdAnimationInfo(pDoc); - pObj->InsertUserData( pInfo ); - } - } - } + SdrObject* pObj = mpShape->GetSdrObject(); + if(pObj) + pInfo = SdDrawDocument::GetShapeUserData(*pObj, bCreate ? true : false); return pInfo; } |