diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-31 09:29:02 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-31 09:30:49 +0100 |
| commit | 4dbed9ef9a2299587d75bd9fae96b05dac0675c3 (patch) | |
| tree | 88801a5d58defeefea5c98acb25c8bb84ad32afa /sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | |
| parent | 328f861dfbe7086c85dbd0d791c5f18b0714ca75 (diff) | |
Use oox::drawingml::convertEmuToHmm()
And get rid of the writerfilter copy, that does no rounding. Adjusted
testcases:
- testFdo80555: 245 -> 247 (should be 246.944444444, so a good change)
- testDMLGroupShapeChildPosition: roundtripped values are now closer to
the initial ones, so also a good change
Change-Id: I4dec7857a0df77face01b7a8ba1da7c647a24b6c
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 62e9df063128..1432888887c6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -314,12 +314,12 @@ DECLARE_OOXMLEXPORT_TEST(testDMLShapeFillPattern, "dml-shape-fillpattern.docx") DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeChildPosition, "dml-groupshape-childposition.docx") { - // Problem was parent transformation was ingnored fully, but translate component + // Problem was parent transformation was ignored fully, but translate component // which specify the position must be also applied for children of the group. uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY); uno::Reference<drawing::XShape> xChildGroup(xGroup->getByIndex(1), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? -2119 : -2122), xChildGroup->getPosition().X); + CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? -2120 : -2122), xChildGroup->getPosition().X); CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? 11336 : 11333), xChildGroup->getPosition().Y); xGroup.set(xChildGroup, uno::UNO_QUERY); @@ -328,7 +328,7 @@ DECLARE_OOXMLEXPORT_TEST(testDMLGroupShapeChildPosition, "dml-groupshape-childpo CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? 11336 : 11333), xChildGroup->getPosition().Y); xChildGroup.set(xGroup->getByIndex(1), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? -2119 : -2122), xChildGroup->getPosition().X); + CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? -2120 : -2122), xChildGroup->getPosition().X); CPPUNIT_ASSERT_EQUAL(sal_Int32(mbExported ? 14026 : 14023), xChildGroup->getPosition().Y); } |