From 9c94bae963ef5019f6ca0394d076b1288969aa53 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 1 Dec 2020 09:09:45 +0000 Subject: Resolves: tdf#138549 use GetSpecialTextBoxShadow to identify ScPostIt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit instead of a 'special' name which causes undo-related causes side effects Change-Id: Id36b0b5360ddde3469721a7c837fe3942af08209 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106924 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- svx/source/svdraw/svdotxat.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'svx') diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 4b96bb04c12a..5ba5ec6a82cc 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -263,8 +263,12 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight() if (auto pRectObj = dynamic_cast(this)) { // this is a hack pRectObj->SetXPolyDirty(); } + bool bScPostIt = false; if (auto pCaptionObj = dynamic_cast(this)) { // this is a hack pCaptionObj->ImpRecalcTail(); + // tdf#114956, tdf#138549 use GetSpecialTextBoxShadow to recognize + // that this SdrCaption is for a ScPostit + bScPostIt = pCaptionObj->GetSpecialTextBoxShadow(); } // to not slow down EditView visualization on Overlay (see @@ -278,8 +282,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight() GetTextEditOutliner() && GetTextEditOutliner()->hasEditViewCallbacks()); - // tdf#114956 always broadcast change for ScPostIts - if (!bSuppressChangeWhenEditOnOverlay || GetName() == "ScPostIt") + if (!bSuppressChangeWhenEditOnOverlay || bScPostIt) { SetChanged(); BroadcastObjectChange(); -- cgit