diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-05 09:08:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-11 12:43:47 +0000 |
| commit | c5f4c528123d6c65b489ac18ab7892bc92866b09 (patch) | |
| tree | 0f6df3996971049a509f81c0218f73328805c119 | |
| parent | cce1320efa93cc42300e457b898d892ca580ddca (diff) | |
tdf#96674 drawingML import: fix handling of zero width/height lines
(cherry picked from commit 627c2469843c9461b665c4571f1214aca7fc36a4)
Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498
Reviewed-on: https://gerrit.libreoffice.org/21342
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 13 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf96674.docx | bin | 0 -> 14947 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 |
3 files changed, 22 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index d7247bee3cee..4a9223fbfb6e 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -510,7 +510,18 @@ Reference< XShape > Shape::createAndInsert( bool bIsWriter = xModelInfo->supportsService("com.sun.star.text.TextDocument"); for( i = 0; i < nNumPoints; ++i ) { - const ::basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) ); + basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) ); + + // Guard against zero width or height. + if (i) + { + const basegfx::B2DPoint& rPreviousPoint = aPoly.getB2DPoint(i - 1); + if (aPoint.getX() - rPreviousPoint.getX() == 0) + aPoint.setX(aPoint.getX() + 1); + if (aPoint.getY() - rPreviousPoint.getX() == 0) + aPoint.setY(aPoint.getY() + 1); + } + if (bIsWriter && bInGroup) // Writer's draw page is in twips, and these points get passed // to core without any unit conversion when Writer diff --git a/sw/qa/extras/ooxmlimport/data/tdf96674.docx b/sw/qa/extras/ooxmlimport/data/tdf96674.docx Binary files differnew file mode 100644 index 000000000000..752479c2ea16 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf96674.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 87435f556916..043f7f4401e4 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2859,6 +2859,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf78902, "tdf78902.docx") CPPUNIT_ASSERT_EQUAL(2, getPages()); } +DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx") +{ + uno::Reference<drawing::XShape> xShape(getShape(1), uno::UNO_QUERY); + CPPUNIT_ASSERT(xShape.is()); + awt::Size aActualSize(xShape->getSize()); + // This was 3493: the vertical line was horizontal. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aActualSize.Width); + CPPUNIT_ASSERT(aActualSize.Height > 0); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |