diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-23 14:26:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-05-23 17:13:04 +0200 |
| commit | 383b82ef8e2c36415cf1039885bef4d44db412ac (patch) | |
| tree | 867dff632497d7e8379a51ec058b5678256a4379 /oox | |
| parent | f7a40e1470431d8978d4ca96e7651af9b0609df3 (diff) | |
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 <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit da0a44b415f630ce39617b8c8f0c366177a7705e)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
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 <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; @@ -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; |