diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-04 13:59:14 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-02-07 11:09:36 +0100 |
| commit | 8a17c14c856c167229bfefef2e6ea6b6e8ac201a (patch) | |
| tree | acff904cd7f1909c5593caa3c87519155e88e514 | |
| parent | 284820c9f45e0a729f1cd686236cd19d8d032ef4 (diff) | |
tdf#129789 bitmap in comment lost on load
regression from
commit b4a1b89cc84086dfd6f471d7f23fecf0ec8f3331
tdf#119650 slow saving spreadsheet with comments, part 2
Change-Id: I8f6aa6b784b50b80311a420bdff9195ba88f5cff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87968
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 174ba963e05c9dedd57c2027f8656fe1f17030c2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88042
(cherry picked from commit 9ffcc046a3f6afc659dfbe296507204b2e8fa670)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88113
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Michael Stahl <michael.stahl@cib.de>
| -rw-r--r-- | sc/source/core/data/postit.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index b81d17cb6ef0..b92082ef7115 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -143,7 +143,7 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj& rCaption, ScDocument& rDoc, { /* Updates caption item set according to the passed item set while removing shadow items. */ - aItemSet.MergeValues(*pExtraItemSet); + aItemSet.Put(*pExtraItemSet); // reset shadow items aItemSet.Put( makeSdrShadowItem( false ) ); aItemSet.Put( makeSdrShadowXDistItem( 100 ) ); |