diff options
| author | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-03-09 18:32:29 +0100 |
|---|---|---|
| committer | Christian Lippka ORACLE <christian.lippka@oracle.com> | 2011-03-09 18:32:29 +0100 |
| commit | d30085b1ee435059d01a3d8d947803ebd91041c2 (patch) | |
| tree | 84eadcdf46e95010f3fa1ea414640bbd2b285f50 /sd/source/ui | |
| parent | f269295e80eba9515f48f09561d04594b2652469 (diff) | |
impress210: #i41995# fixed import of path animation from sxi files
Diffstat (limited to 'sd/source/ui')
| -rwxr-xr-x | sd/source/ui/unoidl/unoobj.cxx | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 681aad8f44ed..ddb115a21525 100755 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -658,36 +658,17 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, case WID_MASTERDEPEND: SetMasterDepend( ::cppu::any2bool(aValue) ); break; -/* todo case WID_ANIMPATH: { - uno::Reference< drawing::XShape > xShape; - aValue >>= xShape; + uno::Reference< drawing::XShape > xShape( aValue, uno::UNO_QUERY ); + SdrPathObj* pObj = xShape.is() ? dynamic_cast< SdrPathObj* >( GetSdrObjectFromXShape( xShape ) ) : NULL; - SdrObject* pObj = NULL; - if(xShape.is()) - pObj = GetSdrObjectFromXShape( xShape ); - - if( pObj == NULL || !pObj->ISA( SdrPathObj ) ) + if( pObj == NULL ) throw lang::IllegalArgumentException(); - pInfo->mpPathObj = (SdrPathObj*)pObj; - - SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL; - if( pDoc ) - { - pInfo = pDoc->GetAnimationInfo(pObj); - if( pInfo == NULL ) - { - pInfo = new SdAnimationInfo(pDoc); - pObj->InsertUserData( pInfo ); - } - pInfo->mbInvisibleInPresentation = sal_True; - } - + EffectMigration::SetAnimationPath( mpShape, pObj ); break; } -*/ case WID_IMAGEMAP: { SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL; |