From 174ba963e05c9dedd57c2027f8656fe1f17030c2 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 4 Feb 2020 13:59:14 +0200
Subject: 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>
---
 sc/source/core/data/postit.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sc')

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 ) );
-- 
cgit