diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 11:46:07 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 11:46:07 +0200 |
| commit | 89d568da16f746cb8bc94fb21cc29dd5f0031a75 (patch) | |
| tree | 2fd58ec833b2481f0350ef6f89f407014dd3e848 /oox | |
| parent | a6d8f4f075ffb9afc140c6c1a1a86c62d2e83d30 (diff) | |
nativeb: merging heads
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index dea4a6a51206..c8f0dd7c2f5a 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -158,6 +158,8 @@ void Shape::addShape( if ( xShapes.is() ) addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap ); } + if( xLockable.is() ) + xLockable->removeActionLock(); } catch( const Exception& ) { @@ -370,6 +372,10 @@ Reference< XShape > Shape::createAndInsert( 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 ) { |