oox/source/drawingml/customshapeproperties.cxx | 11 +----------
sw/qa/extras/ooxmlexport/data/tdf91429.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 9 +++++++++
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit da0a44b415f630ce39617b8c8f0c366177a7705e
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat May 23 14:26:27 2015 +0200
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.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index e688d2d..12c7c3f 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;
diff --git a/sw/qa/extras/ooxmlexport/data/tdf91429.docx
b/sw/qa/extras/ooxmlexport/data/tdf91429.docx
new file mode 100644
index 0000000..5fc5f53
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf91429.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 03afe28..ac7ba3c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -990,6 +990,15 @@ DECLARE_OOXMLEXPORT_TEST(testExportShadow, "bnc637947.odt")
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:effectLst/a:outerShdw/a:srgbClr",
"val" , "000000");
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:effectLst/a:outerShdw/a:srgbClr/a:alpha",
"val" , "38000");
}
+
+DECLARE_OOXMLEXPORT_TEST(testExportAdjustmentValue, "tdf91429.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+ if (!pXmlDoc)
+ return;
+
+
assertXPath(pXmlDoc,"/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:prstGeom/a:avLst/a:gd",
"fmla", "val 50000");
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
