Revert "reorganise code a little so ole controls are catered for wrt fdo#49430"

This reverts commit 76bab166.

oox/inc/oox/vml/vmldrawing.hxx

@@ -157,7 +157,6 @@ public:
         model into the form, and the shape into the passed UNO shape container. */
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
                         createAndInsertXControlShape(
-                            const ClientData* pClientData,
                             const ::oox::ole::EmbeddedControl& rControl,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
                             const ::com::sun::star::awt::Rectangle& rShapeRect,

oox/source/vml/vmldrawing.cxx

@@ -247,7 +247,7 @@ Reference< XShape > Drawing::createAndInsertXShape( const OUString& rService,
     return xShape;
 }
 
-Reference< XShape > Drawing::createAndInsertXControlShape( const ClientData* pClientData, const ::oox::ole::EmbeddedControl& rControl,
+Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::EmbeddedControl& rControl,
         const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect, sal_Int32& rnCtrlIndex ) const
 {
     Reference< XShape > xShape;

oox/source/vml/vmlshape.cxx

@@ -557,7 +557,7 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes
             {
                 // create and return the control shape (including control model)
                 sal_Int32 nCtrlIndex = -1;
-                Reference< XShape > xShape = mrDrawing.createAndInsertXControlShape( *this, aControl, rxShapes, rShapeRect, nCtrlIndex );
+                Reference< XShape > xShape = mrDrawing.createAndInsertXControlShape( aControl, rxShapes, rShapeRect, nCtrlIndex );
                 // on error, proceed and try to create picture from replacement image
                 if( xShape.is() )
                     return xShape;

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
         {