diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-10-19 21:07:10 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-10-20 09:01:34 +0200 |
| commit | c719db99166a7b4770855a9599ec65c70cd256c5 (patch) | |
| tree | f8021c911255e7ad7b099ab731d8d56b6c1ee882 /oox | |
| parent | 9e455724e50bf512683b1cddfeb7493e047c19ae (diff) | |
tdf#137417 oox smartart: avoid considering rules in vertical linear layouts
Regression from commit 0024c48b4822062995effed7db4f1281196384bb (oox
smartart: consider rules when scaling in linear layout, 2020-07-31), the
problem is that I only tested horizontal layouts and this is not working
for vertical layouts.
Just disable the vertical case for now, to avoid unwanted side effects.
Change-Id: I31a894157996a2371b8d0ec482ee91dc4d5b053e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104541
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 644c31790d64..5071a7bd52d4 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -1376,6 +1376,12 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>& aChildrenToShrink.insert(rRule.msForName); } + if (nDir == XML_fromT || nDir == XML_fromB) + { + // TODO consider rules for vertical linear layout as well. + aChildrenToShrink.clear(); + } + if (!aChildrenToShrink.empty()) { // Have scaling info from rules: then only count scaled children. |