[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source

[Fridrich Strba]

 oox/source/xls/drawingfragment.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit eee0a07a8119bf097b680e4481302f3ab2e68eac
Author: Noel Power <noel.power at novell.com>
Date:   Wed May 30 14:06:27 2012 +0100

    don't rotate calc shapes if twoCellAnchor, partial fix bnc#762542
    
    Change-Id: I3ccf6d87db2e9c33f2adaf92e138018f2e27528b
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/oox/source/xls/drawingfragment.cxx b/oox/source/xls/drawingfragment.cxx
index 64f0164..c547b76 100644
--- a/oox/source/xls/drawingfragment.cxx
+++ b/oox/source/xls/drawingfragment.cxx
@@ -274,6 +274,10 @@ void DrawingFragment::onEndElement()
         case XDR_TOKEN( twoCellAnchor ):
             if( mxDrawPage.is() && mxShape.get() && mxAnchor.get() )
             {
+                // Rotation is decided by orientation of shape determined
+                // by the anchor position given by 'twoCellAnchor'
+                if ( getCurrentElement() == XDR_TOKEN( twoCellAnchor ) )
+                    mxShape->setRotation(0);
                 EmuRectangle aShapeRectEmu = mxAnchor->calcAnchorRectEmu( getDrawPageSize() );
                 if( (aShapeRectEmu.X >= 0) && (aShapeRectEmu.Y >= 0) && (aShapeRectEmu.Width >= 0) && (aShapeRectEmu.Height >= 0) )
                 {