[Libreoffice-commits] core.git: oox/source

[Jacobo Aragunde Pérez]

 oox/source/export/vmlexport.cxx |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit cc8c94b362e89d7d7e974119be77679f2f344d91
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date:   Fri Oct 25 09:09:55 2013 +0200

    fdo#70838: Fix size issue when exporting shapes to docx.
    
    We were saving the size of the rotated shape bounding box in the docx file
    but that size was being interpreted as the size of the original, unrotated
    shape.
    
    Now VMLExport::Commit will use the dimensions of the rectangle received as
    a parameter to save to the file instead of those returned by SdrAttrObject
    ->GetSnapRect
    
    Change-Id: I53670db77f5e5320a87579dcd56617d5ccf1851a
    Reviewed-on: https://gerrit.libreoffice.org/6432
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 8eeb9dc..f87e773 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -326,15 +326,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
     if ( m_nShapeType == ESCHER_ShpInst_Line )
         AddLineDimensions( rRect );
     else
-    {
-        Rectangle aRect(rRect);
-        if (m_pNdTopLeft)
-        {
-            aRect = m_pSdrObject->GetSnapRect();
-            aRect -= *m_pNdTopLeft;
-        }
-        AddRectangleDimensions( *m_pShapeStyle, aRect );
-    }
+        AddRectangleDimensions( *m_pShapeStyle, rRect );
 
     // properties
     bool bAlreadyWritten[ 0xFFF ];