Commits

Anonymous committed fa92af4

#i10000# fixed broken hg transplant

Comments (0)

Files changed (1)

oox/source/drawingml/shape.cxx

             if ( xShapes.is() )
                 addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap );
         }
-		if( xLockable.is() )
+		Reference< document::XActionLockable > xLockable( mxShape, UNO_QUERY );
+        if( xLockable.is() )
 			xLockable->removeActionLock();
     }
     catch( const Exception&  )
 		if( xLockable.is() )
 			xLockable->addActionLock();
 
-		Reference< document::XActionLockable > xLockable( mxShape, UNO_QUERY );
-		if( xLockable.is() )
-			xLockable->addActionLock();
-
-		Reference< document::XActionLockable > xLockable( mxShape, UNO_QUERY );
-		if( xLockable.is() )
-			xLockable->addActionLock();
-
 		// sj: removing default text of placeholder objects such as SlideNumberShape or HeaderShape
 		if ( bClearText )
 		{
                 getTextBody()->insertAt( rFilterBase, xText, xAt, aCharStyleProperties, mpMasterTextListStyle );
             }
         }
-		if( xLockable.is() )
+        if( xLockable.is() )
 			xLockable->removeActionLock();
     }