From ade2565cc2b2e5e8cf35fe828bf85649f7ff593a Mon Sep 17 00:00:00 2001 From: Czeber László Ádám Date: Fri, 30 Jun 2023 12:24:53 +0200 Subject: tdf#117307 sc: Comments are duplicated after Row delete and Undo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The comment was cloned if you deleted and restored its filtered cell. During Undo, the comment was cloned even if it was for the same cell, resulting duplicated comments there. Regression from commit eefe13c77d01be37c911e75af191717a944fedb3 "shrinking the DB area just causes problems, tdf#89546". Change-Id: I86d0813c56ba63370aae6b5f7807a19747e2378c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153803 Tested-by: László Németh Reviewed-by: László Németh --- sc/source/core/data/postit.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 106a249e5666..cbb2eff1ff14 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -483,6 +483,9 @@ ScPostIt::~ScPostIt() std::unique_ptr ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const ScAddress& rDestPos, bool bCloneCaption ) const { + // tdf#117307: Don't clone comment, if it is in the same position + if ( (rOwnPos == rDestPos) && !mrDoc.IsClipboard() ) + bCloneCaption = false; CreateCaptionFromInitData( rOwnPos ); sal_uInt32 nPostItId = comphelper::LibreOfficeKit::isActive() ? 0 : mnPostItId; return bCloneCaption ? std::make_unique( rDestDoc, rDestPos, *this, nPostItId ) : std::make_unique( rDestDoc, rDestPos, maNoteData, false, mnPostItId ); -- cgit