summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-02-04 13:59:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-02-04 14:40:11 +0100
commit174ba963e05c9dedd57c2027f8656fe1f17030c2 (patch)
tree79118cfd99df3fa8165f1d6ef8f0f2ab861ea31b
parent83c8f77225348bd2b620a5c937a6c5da1cea8b1d (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>
-rw-r--r--sc/source/core/data/postit.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index f58203b886b4..89763e52a0a3 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 ) );