summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-05-04 11:54:29 (GMT)
committerNoel Power <noel.power@novell.com>2012-05-04 11:54:29 (GMT)
commitda81525ec2e86364def8b558e16c4e8eca6a121e (patch)
tree5d9b6e68ab544e97048e626f0e4b3aa10680265a
parentb2af4b20a009cce57f547865b02fde41d1232a17 (diff)
(reworked )reorg. code a little so ole controls are catered for wrt fdo#49430
Change-Id: Ic1d5e31085484e564de61b45b524aec5b5014ee0
-rw-r--r--sc/source/filter/oox/drawingfragment.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 012c9a1..977c8de 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -614,12 +614,6 @@ 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;
}
}
@@ -637,6 +631,12 @@ 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
{