summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-05-24 15:49:47 (GMT)
committerNoel Power <noel.power@novell.com>2012-05-25 10:34:05 (GMT)
commit0a8de8d937ea1e9cb26ea7c89951f559961b49de (patch)
tree2f8c7f4d73c3c2dabf0c68ddd700f40d12d8829f
parent112d94c67b9a27f0df1784ab8f88c051f466b04d (diff)
Revert "(reworked )reorg. code a little so ole controls are catered for wrt fdo#49430"
This reverts commit da81525ec2e86364def8b558e16c4e8eca6a121e.
-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 977c8de..012c9a1 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
{