diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-01 09:09:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-01 12:14:47 +0100 |
| commit | 4795e8ac3ed56b2f1ff93b0ac870a45be2428bca (patch) | |
| tree | f2abb25f8f992d56bd4f5cbc1dffbce31b5b7c3b /svx | |
| parent | 7f2828aa84f87c85c92969a9b0eace4df75870df (diff) | |
Resolves: tdf#138549 use GetSpecialTextBoxShadow to identify ScPostIt
instead of a 'special' name which causes undo-related causes side effects
Change-Id: Id36b0b5360ddde3469721a7c837fe3942af08209
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106925
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdotxat.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 6f97960b5377..315e57e7cb06 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -263,8 +263,12 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight() if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { // this is a hack static_cast<SdrRectObj*>(this)->SetXPolyDirty(); } - if (dynamic_cast<const SdrCaptionObj *>(this) != nullptr) { // this is a hack - static_cast<SdrCaptionObj*>(this)->ImpRecalcTail(); + bool bScPostIt = false; + if (auto pCaptionObj = dynamic_cast<SdrCaptionObj *>(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(); |