diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-08-03 09:57:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-08-03 11:17:17 +0200 |
| commit | 880673412143a7db7ea1bf4766040662dfc085dc (patch) | |
| tree | 6d601e005bc0c6d20718ce5cd4506a3ff77246cd /oox | |
| parent | e54777276d28e6bbceefa07e260926c81790938c (diff) | |
oox smartart, linear layout: fix scaling of spacing without rules
With this, finally the arrow shape has the correct horizontal position
and width, even if the markup is as complex as the PowerPoint UI
generates it (the previous version was a more minimal version).
Change-Id: I59f237c582053067e890180a1ae40471e5f46dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99894
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 46 |
1 files changed, 43 insertions, 3 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 2fb4e60d2f2d..a48ffe3e4682 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -963,6 +963,8 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>& { fCount -= 1.0; + bool bIsDependency = false; + double fFactor = 0; for (const auto& rConstraint : rConstraints) { if (rConstraint.msForName != aCurrShape->getInternalName()) @@ -970,16 +972,25 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>& continue; } - if (aChildrenToShrink.find(rConstraint.msRefForName) == aChildrenToShrink.end()) + if ((nDir == XML_fromL || nDir == XML_fromR) && rConstraint.mnType != XML_w) { continue; } + if ((nDir == XML_fromL || nDir == XML_fromR) && rConstraint.mnType == XML_w) + { + fFactor = rConstraint.mfFactor; + } - if ((nDir == XML_fromL || nDir == XML_fromR) && rConstraint.mnType != XML_w) + if ((nDir == XML_fromT || nDir == XML_fromB) && rConstraint.mnType != XML_h) { continue; } - if ((nDir == XML_fromT || nDir == XML_fromB) && rConstraint.mnType != XML_h) + if ((nDir == XML_fromT || nDir == XML_fromB) && rConstraint.mnType == XML_h) + { + fFactor = rConstraint.mfFactor; + } + + if (aChildrenToShrink.find(rConstraint.msRefForName) == aChildrenToShrink.end()) { continue; } @@ -988,8 +999,29 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>& // other child which will be scaled. fCount += rConstraint.mfFactor; aChildrenToShrinkDeps.insert(aCurrShape->getInternalName()); + bIsDependency = true; break; } + + if (!bIsDependency && aCurrShape->getServiceName() == "com.sun.star.drawing.GroupShape") + { + bool bScaleDownEmptySpacing = false; + if (nDir == XML_fromL || nDir == XML_fromR) + { + oox::OptValue<sal_Int32> oWidth = findProperty(aProperties, aCurrShape->getInternalName(), XML_w); + bScaleDownEmptySpacing = oWidth.has() && oWidth.get() > 0; + } + if (!bScaleDownEmptySpacing && (nDir == XML_fromT || nDir == XML_fromB)) + { + oox::OptValue<sal_Int32> oHeight = findProperty(aProperties, aCurrShape->getInternalName(), XML_h); + bScaleDownEmptySpacing = oHeight.has() && oHeight.get() > 0; + } + if (bScaleDownEmptySpacing && aCurrShape->getChildren().empty()) + { + fCount += fFactor; + aChildrenToShrinkDeps.insert(aCurrShape->getInternalName()); + } + } } } } @@ -1083,6 +1115,14 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>& aCurrPos.Y = (rShape->getSize().Height - aSize.Height) / 2; if (nIncY) aCurrPos.X = (rShape->getSize().Width - aSize.Width) / 2; + if (aCurrPos.X < 0) + { + aCurrPos.X = 0; + } + if (aCurrPos.Y < 0) + { + aCurrPos.Y = 0; + } aCurrShape->setPosition(aCurrPos); |