diff options
| author | Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com> | 2019-05-08 21:49:34 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-05-31 16:46:22 +0200 |
| commit | 3235ae697e1ae90e218f5c3bee280659d8a74a60 (patch) | |
| tree | b441a9a64d817c97a00979ab2c640600f53df7d7 /include | |
| parent | 1124e98e935cec42c51f25f1fc713285b1044d07 (diff) | |
SmartArt: support diagram background
Solved by adding additional shape filling whole diagram.
MS PowerPoint does the same when converting SmartArt to shapes.
Background shape is also copied when loading from drawingML fallback,
appearently there is no background information.
Corrected SmartArt import tests, so that they are aware of extra shape.
Change-Id: I6154f8e1b34e5867ab582d6fc54459c7c93edbac
Reviewed-on: https://gerrit.libreoffice.org/72012
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/73250
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/shape.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 9e879b47bc9c..73fb85ad8dc9 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -150,6 +150,7 @@ public: const OUString& getId() { return msId; } void setHidden( bool bHidden ) { mbHidden = bHidden; } void setHiddenMasterShape( bool bHiddenMasterShape ) { mbHiddenMasterShape = bHiddenMasterShape; } + void setLocked( bool bLocked ) { mbLocked = bLocked; } void setSubType( sal_Int32 nSubType ) { mnSubType = nSubType; } sal_Int32 getSubType() const { return mnSubType; } void setSubTypeIndex( sal_Int32 nSubTypeIndex ) { moSubTypeIndex = nSubTypeIndex; } @@ -336,6 +337,7 @@ private: bool mbHiddenMasterShape; // master shapes can be hidden in layout slides // we need separate flag because we don't want // to propagate it when applying reference shape + bool mbLocked; bool mbLockedCanvas; ///< Is this shape part of a locked canvas? bool mbWps; ///< Is this a wps shape? bool mbTextBox; ///< This shape has a textbox. |