From 73cc724dc35551ea349b3da0c4ecd6cba2fdd0ae Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 13 Nov 2018 18:00:50 +0100 Subject: Related: tdf#117761 oox smartart: backport fixes related to process types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a combination of 9 commits. This is the 1st commit: oox smartart, accent process: add support for reading values from constraints (cherry picked from commit b389aafee9cfba9dc4dfa552347be39ff9fe41b2) This is the commit #2: oox smartart, accent process: add support for zorder offsets (cherry picked from commit cd348a6244a092c251a8e1362cd78de562d7bef6) This is the commit #3: oox smartart, accent process: fix overlapping shape pairs (cherry picked from commit 67e062aa5e5946d4985921fe2b6f87766f363ddc) This is the commit #4: oox smartart, accent process: handle multiple runs from a data point (cherry picked from commit cfa76f538a44d4396574ece59e8a3953c22c6eb7) This is the commit #5: oox smartart, accent process: handle followSib axis of forEach (cherry picked from commit aedc5427e4b6645ff3257e523c33190cf5e1934d) This is the commit #6: oox smartart, accent process: handle connector shape between pairs (cherry picked from commit 7f66a340933339974b5c6d70af4ae3c17e4f001a) This is the commit #7: oox smartart, accent process: adjust size of connector from constraints (cherry picked from commit ddc2786831367577967e806d603f337a2e42806a) This is the commit #8: oox smartart, continuous block process: read space width from constraint (cherry picked from commit ee6787fc5597b7f730c4ee3a1f2a1b261d0a5644) Conflicts: oox/source/drawingml/diagram/diagramlayoutatoms.cxx This is the commit #9: oox smartart, accent process: fix missing bullets and large para indent (cherry picked from commit 6277a767f33bb5327408dafff2fed199087e938d) Change-Id: I60bbee75f3e834551ebb1963a2f42101f3bd91d4 Reviewed-on: https://gerrit.libreoffice.org/65352 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/oox/drawingml/shape.hxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'include') diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 6028a11c2bc0..e04a58beb4a6 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -214,6 +214,14 @@ public: const LinkedTxbxAttr& getLinkedTxbxAttributes() { return maLinkedTxbxAttr; }; bool isLinkedTxbx() { return mbHasLinkedTxbx; }; + void setZOrder(sal_Int32 nZOrder) { mnZOrder = nZOrder; } + + sal_Int32 getZOrder() const { return mnZOrder; } + + void setZOrderOff(sal_Int32 nZOrderOff) { mnZOrderOff = nZOrderOff; } + + sal_Int32 getZOrderOff() const { return mnZOrderOff; } + protected: css::uno::Reference< css::drawing::XShape > const & @@ -327,6 +335,12 @@ private: bool mbHasLinkedTxbx; // this text box has linked text box ? css::uno::Sequence maDiagramDoms; + + /// Z-Order. + sal_Int32 mnZOrder = 0; + + /// Z-Order offset. + sal_Int32 mnZOrderOff = 0; }; } } -- cgit