From 8a17c14c856c167229bfefef2e6ea6b6e8ac201a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 4 Feb 2020 13:59:14 +0200 Subject: tdf#129789 bitmap in comment lost on load MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (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í Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- sc/source/core/data/postit.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) ); -- cgit