From 8753e4e3ac000d325aedc9bb004c271f2e18e8c2 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 19 Oct 2020 21:07:10 +0200 Subject: 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. (cherry picked from commit c719db99166a7b4770855a9599ec65c70cd256c5) Change-Id: I31a894157996a2371b8d0ec482ee91dc4d5b053e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104550 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'oox/source/drawingml/diagram') diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 5de660a3b6e4..7f926cc9a5e8 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -1045,6 +1045,12 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector& 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. -- cgit