diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2018-11-21 16:17:42 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2018-12-17 13:33:07 +0100 |
commit | 8d6e14765145ab7c9cb0cbf6956eaf07db10139a (patch) | |
tree | a503c8d2e89a79fc7a1132dfcffdd12fcdc7e0ba /oox | |
parent | 4a8677150c428855cd67c71341b6bb6d07b59f84 (diff) |
oox smartart, accent process: fix overlapping shape pairs
Linear algorithm had an idea how to take width from constrains, but that
was unused for embedded child algorithms.
Change-Id: If4c497e053ea0d134a1ffc529f1d233ec4fc50db
Reviewed-on: https://gerrit.libreoffice.org/63725
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 67e062aa5e5946d4985921fe2b6f87766f363ddc)
Reviewed-on: https://gerrit.libreoffice.org/65248
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index c053aa4c441a..bb5ed2ad7704 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -523,7 +523,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, aSize.Width *= fWidthScale; aCurrShape->setSize(aSize); - aCurrShape->setChildSize(aChildSize); + aCurrShape->setChildSize(aSize); aCurrPos.X += nIncX * (aSize.Width + fSpace*aSize.Width); aCurrPos.Y += nIncY * (aChildSize.Height + fSpace*aChildSize.Height); } |