[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - oox/source

[Andras Timar]

 oox/source/drawingml/customshapeproperties.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 6a17a535c34c76a766fe693ae10c58ddac6a3ab4
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat May 23 18:18:35 2015 +0200

    Revert "Resolves: #i124703# adapt coordinate range from ms relative..."
    
    This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467.
    
    Conflicts:
    	oox/source/drawingml/customshapeproperties.cxx
    
    Change-Id: I8b09ff166e006d4791585da61316f5841da18f69

diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 7a1b171..6b73970 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
-#include <basegfx/numeric/ftools.hxx>
 #include <osl/diagnose.h>
 
 using namespace ::oox::core;
@@ -205,15 +204,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
                                     }
                                 } else if ( aAdjustmentSeq.getLength() > 0 ) {
                                     EnhancedCustomShapeAdjustmentValue aAdjustmentVal;
-
-                                    sal_Int32 nValue((*aIter).maFormula.toInt32());
-
-                                    // #i124703# The ms control point coordinates are relative to the
-                                    // object center in the range [-50000 .. 50000] while our customshapes
-                                    // use a range from [0 .. 21600], so adapt the value as needed
-                                    nValue = basegfx::fround((double(nValue) + 50000.0) * (21600.0 / 100000.0));
-
-                                    aAdjustmentVal.Value <<= nValue;
+                                    aAdjustmentVal.Value <<= (*aIter).maFormula.toInt32();
                                     aAdjustmentVal.State = PropertyState_DIRECT_VALUE;
                                     aAdjustmentVal.Name = (*aIter).maName;
                                     aAdjustmentSeq[ nIndex++ ] = aAdjustmentVal;