diff options
| author | Noel Power <noel.power@novell.com> | 2012-05-04 12:51:27 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-05-04 12:51:27 +0100 |
| commit | b2af4b20a009cce57f547865b02fde41d1232a17 (patch) | |
| tree | 179288e195e2389bd90919d3cb7e628ab8ef04af /sc | |
| parent | 4d7047860fc5869576f330a437edd6744d59bd61 (diff) | |
Revert "reorganise code a little so ole controls are catered for wrt fdo#49430"
This reverts commit 76bab166e21bc3646ae2d3079aae2c5d9ce0d1e5.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 977c8debbd35..012c9a19a3d0 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -614,6 +614,12 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S getBaseFilter().getVbaProject().registerMacroAttacher( xAttacher ); } } + if ( !pClientData->maAnchor.isEmpty() ) + { + ShapeAnchor aAnchor( *this ); + aAnchor.importVmlAnchor( pClientData->maAnchor ); + aAnchor.applyToXShape( xShape ); + } return xShape; } } @@ -631,12 +637,6 @@ void VmlDrawing::notifyXShapeInserted( const Reference< XShape >& rxShape, // convert settings from VML client data if( const ::oox::vml::ClientData* pClientData = rShape.getClientData() ) { - if ( !pClientData->maAnchor.isEmpty() ) - { - ShapeAnchor aAnchor( *this ); - aAnchor.importVmlAnchor( pClientData->maAnchor ); - aAnchor.applyToXShape( rxShape ); - } // specific settings for embedded form controls try { |