diff options
| author | Attila Bakos (NISZ) <bakos.attilakaroly@nisz.hu> | 2022-01-24 10:57:34 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-02-03 09:28:52 +0100 |
| commit | 65b09ef1c5e24651579eb11900cf2ddbbb7b0971 (patch) | |
| tree | c738c6d5d485038bd9f6478c534e530a88893ece /include/oox | |
| parent | 4a38ca4035ac03571925e72cb47e0beb8da2003a (diff) | |
tdf#146803 tdf#146805 OOXML import: fix bodyPr at grouped shapes
Grouped text boxes (WPG) lost their alignment and spacing,
because the bodyPr tag what has the information for this,
processed after the textbox content, and applied to the XShape
which in case of group shape is not ready. To solve this, the
mentioned properties read for the shape member after copied
to the XShape when its ready, and than synced to the textbox.
Regression from commit 121cbc250b36290f0f8c7265fea57256dad69553
"tdf#66039 DOCX: import textboxes (with tables, images etc.) in
group shapes".
Change-Id: Ifb5e8bde58613137441bec2e2b51bc67118dab40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128854
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 57a47cbdb4e5..40c8319f67d3 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -205,6 +205,8 @@ public: const Color& getFontRefColorForNodes() const { return maFontRefColorForNodes; } void setLockedCanvas(bool bLockedCanvas); bool getLockedCanvas() const { return mbLockedCanvas;} + void setWPGChild(bool bWPG); + bool isWPGChild() const { return mbWPGChild;} void setWps(bool bWps); bool getWps() const { return mbWps;} void setTextBox(bool bTextBox); @@ -360,6 +362,7 @@ private: // we need separate flag because we don't want // to propagate it when applying reference shape bool mbLocked; + bool mbWPGChild; // Is this shape a child of a WPG shape? bool mbLockedCanvas; ///< Is this shape part of a locked canvas? bool mbWps; ///< Is this a wps shape? bool mbTextBox; ///< This shape has a textbox. |