summaryrefslogtreecommitdiff
path: root/include/oox/drawingml/shape.hxx
diff options
context:
space:
mode:
authorGrzegorz Araminowicz <grzegorz.araminowicz@collabora.com>2019-05-08 21:49:34 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-05-10 12:18:29 +0200
commitc86cf2aaa07538e8c37dc81729905a3bb9ecc1ff (patch)
treeccf989aacdbb0718784518e34a9c942d66b569f7 /include/oox/drawingml/shape.hxx
parent96dd1cd36c2f9446d3455a06b5f77a3954950c03 (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>
Diffstat (limited to 'include/oox/drawingml/shape.hxx')
-rw-r--r--include/oox/drawingml/shape.hxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index e7d06476656d..1f8b163b5d35 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -151,6 +151,7 @@ public:
void setDescription( const OUString& rDescr ) { msDescription = rDescr; }
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; }
@@ -340,6 +341,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.