diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-02-22 17:12:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-22 19:30:16 +0100 |
| commit | 333e9ea15bb57cf1c87ac2ea150de1e3fd79cfcb (patch) | |
| tree | 3b10300cd97c0b0883d68ac1e4a102af2f599b84 /include/oox | |
| parent | 8777fc78ce7913b774d1c6ef660c7668c6c7b526 (diff) | |
oox smartart, picture strip: handle bitmap fill of pres nodes
There were two problems here:
1) We did not import bitmap fill from presentation nodes.
2) Presentation nodes contained properties with reference semantics, so
if you set a bitmap fill for a first and a second shape, then at the end
both shapes contained the second bitmap.
With this, both bitmaps are imported exactly once.
Change-Id: I098a006eb3f58a338400663d57888ca671ed9909
Reviewed-on: https://gerrit.libreoffice.org/68218
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
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 28a5e2907494..c8ffa1b278df 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -220,6 +220,9 @@ public: sal_Int32 getDataNodeType() const { return mnDataNodeType; } + /// Changes reference semantics to value semantics for fill properties. + void cloneFillProperties(); + protected: css::uno::Reference< css::drawing::XShape > const & |