[Libreoffice-commits] .: sc/source

[Noel Power]

 sc/source/filter/oox/drawingfragment.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit da81525ec2e86364def8b558e16c4e8eca6a121e
Author: Noel Power <noel.po...@novell.com>
Date:   Fri May 4 12:54:29 2012 +0100

    (reworked )reorg. code a little so ole controls are catered for wrt 
fdo#49430
    
    Change-Id: Ic1d5e31085484e564de61b45b524aec5b5014ee0

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
         {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits