diff options
| -rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 9 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests-smartart.cxx | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 7dc6e7622cb0..336760575339 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -985,7 +985,14 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, nNumSpaces += 4; sal_Int32 nHeight = rShape->getSize().Height / (nRow + (nRow + nNumSpaces) * fSpace); - aChildSize = awt::Size(rShape->getSize().Width, nHeight); + + if (fChildAspectRatio > 1) + { + // Shrink width if the aspect ratio requires it. + nWidth = std::min(rShape->getSize().Width, + static_cast<sal_Int32>(nHeight * fChildAspectRatio)); + aChildSize = awt::Size(nWidth, nHeight); + } } awt::Point aCurrPos(0, 0); diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 3a98496735ef..22513adc312a 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -980,6 +980,13 @@ void SdImportTestSmartArt::testPictureStrip() // Actual : 263', i.e. the left margin was too small. CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(nWidth * fFactor), nTextLeftDistance); + // Make sure that aspect ratio is not ignored, i.e. width is not larger than height 3 times. + uno::Reference<drawing::XShape> xFirstPair = getChildShape(xGroup, 0); + awt::Size aFirstPairSize = xFirstPair->getSize(); + // Without the accompanying fix in place, this test would have failed: bad width was 16932, good + // width is 12540, but let's accept 12541 as well. + CPPUNIT_ASSERT_LESSEQUAL(aFirstPairSize.Height * 3 + 1, aFirstPairSize.Width); + xDocShRef->DoClose(); } |