oox/source/drawingml/customshapeproperties.cxx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
New commits: commit 299d73bd2dedbdd48945a8816ddef1d741e1f477 Author: Andras Timar <andras.ti...@collabora.com> Date: Sat May 23 18:20:53 2015 +0200 Revert "Resolves: #i124703# adapt coordinate range from ms relative..." This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467. diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 81171a3..9b96f4c 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> using namespace ::oox::core; using namespace ::com::sun::star; @@ -186,15 +185,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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits