(reworked )reorg. code a little so ole controls are catered for wrt fdo#49430

Change-Id: Ic1d5e31085484e564de61b45b524aec5b5014ee0

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
         {