summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-05-23 18:20:53 +0200
committerAndras Timar <andras.timar@collabora.com>2015-05-23 18:20:53 +0200
commit299d73bd2dedbdd48945a8816ddef1d741e1f477 (patch)
tree4fdd0fd25faae84bc435dfe9af3155fd50a898d6 /oox
parent17e0a74a724673803ee64211430d15e19de9d453 (diff)
Revert "Resolves: #i124703# adapt coordinate range from ms relative..."
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx11
1 files changed, 1 insertions, 10 deletions
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 81171a37fc74..9b96f4c28314 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;