diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-28 12:32:21 +0200 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-28 12:32:21 +0200 |
| commit | 9ad72383ccd8e5c2dfede71439b487d052cbd98c (patch) | |
| tree | 3c59677fabf576169d111351b742d19ee982869e /sd | |
| parent | 66307ce86df99f6bd31f2f78665582b377161cad (diff) | |
impress210: resolve name clash
Diffstat (limited to 'sd')
| -rwxr-xr-x | 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 ddb115a21525..ae148ec547cf 100755 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -661,12 +661,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: |