diff options
| -rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index c085fb6daa7f..72fc01a5fe9f 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -356,15 +356,9 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, double fSpace = 0.3; awt::Size aChildSize = rShape->getSize(); - if (nIncX) - aChildSize.Width /= (nCount + (nCount-1)*fSpace); - if (nIncY) - aChildSize.Height /= (nCount + (nCount-1)*fSpace); - if(nCount <= 2 && nIncY) - aChildSize.Height /= 2; - else - aChildSize.Height /= (nCount+1); + aChildSize.Width /= (nCount + (nCount-1)*fSpace); + aChildSize.Height /= (nCount + (nCount-1)*fSpace); awt::Point aCurrPos(0, 0); if (nIncX == -1) @@ -372,11 +366,6 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, if (nIncY == -1) aCurrPos.Y = rShape->getSize().Height - aChildSize.Height; - if(nCount <= 2 && nIncY == -1) - aCurrPos.Y = rShape->getSize().Height - aChildSize.Height*2; - else - aCurrPos.Y = rShape->getSize().Height - aChildSize.Height*(nCount+1); - for (auto & aCurrShape : rShape->getChildren()) { aCurrShape->setPosition(aCurrPos); |