From da0a44b415f630ce39617b8c8f0c366177a7705e Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 23 May 2015 14:26:27 +0200 Subject: tdf#91429 do not convert ooxml preset shape modifier values Revert "Resolves: #i124703# adapt coordinate range from ms relative..." This reverts commit c764a3d978beb2e6197a8d3f7df53d81ebf72467. The reverted commit did not fix anything in LibreOffice in the first place. The document referenced in #i124703# is as good without the patch as with it. But it caused a regression. Conflicts: oox/source/drawingml/customshapeproperties.cxx Change-Id: I65eb114423039e9c9c684cc55009275fd06caacd Reviewed-on: https://gerrit.libreoffice.org/15875 Reviewed-by: Andras Timar Tested-by: Andras Timar --- oox/source/drawingml/customshapeproperties.cxx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'oox') diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index e688d2dd4de5..12c7c3f85d0c 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include using namespace ::oox::core; @@ -209,15 +208,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; -- cgit