summaryrefslogtreecommitdiffstats
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2018-11-21 16:17:42 +0100
committerMiklos Vajna <vmiklos@collabora.com>2018-11-21 18:52:42 +0100
commit67e062aa5e5946d4985921fe2b6f87766f363ddc (patch)
treeb062a176629d44ce482892c697dbea51d670452a /oox
parentprocessing treeview entries in the wrong order (diff)
downloadcore-67e062aa5e5946d4985921fe2b6f87766f363ddc.tar.gz
core-67e062aa5e5946d4985921fe2b6f87766f363ddc.zip
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
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx2
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);
}