[Libreoffice-commits] .: 2 commits - sc/source

[Noel Power]

 sc/source/filter/oox/drawingbase.cxx     |    1 +
 sc/source/filter/oox/drawingfragment.cxx |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 1abc0695d770eebd21256a86aeee14a5384d84c7
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

diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index f041287..9b7d07a 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -257,6 +257,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) )
                 {
commit dbb385df0fc83c36cfc91b82979fabea868592c2
Author: Noel Power <noel.power at novell.com>
Date:   Wed May 30 13:59:52 2012 +0100

    fix missing form control, partial fix for fdo#49430
    
    Change-Id: I7a0dd3d6e25a48449941e258ea5a16a247a8fe05

diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 4a30a15..1cf511c 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -161,6 +161,7 @@ void ShapeAnchor::setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, cons
 void ShapeAnchor::importVmlAnchor( const OUString& rAnchor )
 {
     meAnchorType = ANCHOR_VML;
+    meCellAnchorType = CELLANCHOR_PIXEL;
 
     ::std::vector< OUString > aTokens;
     sal_Int32 nIndex = 0;