diff options
| author | Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com> | 2019-07-07 14:12:05 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-09 17:02:28 +0200 |
| commit | 4a96a5d862ed46bbcb64d34b32720b5b1b3d7ca8 (patch) | |
| tree | b166beb1d116ee949f4339aadc8a9e45c5ac1bba /include | |
| parent | 4248d759744f83a68d334a8b347124719a2886a8 (diff) | |
SmartArt: improve organization chart layout
layout shapes in two steps:
* first calculate vertical child shapes count for every shape
(taking into accout hierBranch alg variable)
* then actual layout using that count to calculate size for subtrees
Change-Id: I2e5ca34ed3383aa9502c52511cc1fb2bee215572
Reviewed-on: https://gerrit.libreoffice.org/75195
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 1f8b163b5d35..5aa6f00318a8 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -225,6 +225,9 @@ public: double getAspectRatio() const { return mfAspectRatio; } + void setVerticalShapesCount(sal_Int32 nVerticalShapesCount) { mnVerticalShapesCount = nVerticalShapesCount; } + sal_Int32 getVerticalShapesCount() const { return mnVerticalShapesCount; } + /// Changes reference semantics to value semantics for fill properties. void cloneFillProperties(); @@ -361,6 +364,9 @@ private: /// Aspect ratio for an in-diagram shape. double mfAspectRatio = 0; + + /// Number of child shapes to be layouted vertically inside org chart in-diagram shape. + sal_Int32 mnVerticalShapesCount = 0; }; } } |