diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-12-06 03:34:43 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-12-06 09:39:15 +0100 |
| commit | f44ed1142d24c2e0adeff039c626f2074c3dab87 (patch) | |
| tree | 42aa3e186f99048cc2977079dbbaee2cb3153928 /sd | |
| parent | e0247cb339336a108ce19e4e64b41d366bea344e (diff) | |
impress210: resolve name clash
# HG changeset patch
# User Ocke Janssen [oj] <Ocke.Janssen@oracle.com>
# Date 1301308341 -7200
# Node ID c6dff567a9e0ee383071e53c64e3f5a06a186015
# Parent de9c2cc66a6d7a2f16479b97b059b38090f317a0
impress210: resolve name clash
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 8341121af06a..6bfa6982e8a7 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -647,12 +647,12 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName, case WID_ANIMPATH: { uno::Reference< drawing::XShape > xShape( aValue, uno::UNO_QUERY ); - SdrPathObj* pObj = xShape.is() ? dynamic_cast< SdrPathObj* >( GetSdrObjectFromXShape( xShape ) ) : NULL; + SdrPathObj* pObj2 = xShape.is() ? dynamic_cast< SdrPathObj* >( GetSdrObjectFromXShape( xShape ) ) : NULL; - if( pObj == NULL ) + if( pObj2 == NULL ) throw lang::IllegalArgumentException(); - EffectMigration::SetAnimationPath( mpShape, pObj ); + EffectMigration::SetAnimationPath( mpShape, pObj2 ); break; } case WID_IMAGEMAP: |