sc/source/core/data/postit.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 0712202b5a62ccb095311b6610b92a19b8cb9f0a Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Feb 4 13:59:14 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Feb 6 07:00:23 2020 +0100 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.gran...@collabora.co.uk> (cherry picked from commit 174ba963e05c9dedd57c2027f8656fe1f17030c2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88043 diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index d2142f84747c..b48249ed787d 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -142,7 +142,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 ) ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits