sc/source/core/data/postit.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 2e4fbdf192ec9468ddbd0fcfe2e36d4db1e36837
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 23 16:25:02 2020 +0000
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Nov 23 21:10:11 2020 +0100
tdf#138428 don't record SetName("ScPostIt") in undo
Change-Id: Iae87db47907078282e48035ad7892dbf52942e53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106432
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 9ccb6c31a8f5..92221fe87430 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -382,9 +382,17 @@ void ScCaptionCreator::CreateCaption( bool bShown, bool
bTailFront )
*mrDoc.GetDrawLayer(), // TTTT should ret a ref?
aTextRect,
aTailPos));
+
// tdf#114956 a way to recognize that this SdrCaption is for a ScPostit in
// SdrTextObj::AdjustTextFrameWidthAndHeight
+ SdrModel& rModel = mxCaption->getSdrModelFromSdrObject();
+ const bool bUndoEnabled = rModel.IsUndoEnabled();
+ if (bUndoEnabled)
+ rModel.EnableUndo(false);
mxCaption->SetName("ScPostIt");
+ if (bUndoEnabled)
+ rModel.EnableUndo(true);
+
// basic caption settings
ScCaptionUtil::SetBasicCaptionSettings( *mxCaption, bShown );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
