From f44ed1142d24c2e0adeff039c626f2074c3dab87 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Tue, 6 Dec 2011 03:34:43 +0100 Subject: impress210: resolve name clash # HG changeset patch # User Ocke Janssen [oj] # Date 1301308341 -7200 # Node ID c6dff567a9e0ee383071e53c64e3f5a06a186015 # Parent de9c2cc66a6d7a2f16479b97b059b38090f317a0 impress210: resolve name clash --- sd/source/ui/unoidl/unoobj.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sd/source') 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: -- cgit