summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-01 09:09:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-12-01 14:39:19 +0100
commit9c94bae963ef5019f6ca0394d076b1288969aa53 (patch)
tree888a3b015459be532180e6b7c449c72cdff014c0
parent87ea90dfdd9cc9a430487cfb6e37a5dd6b393a53 (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/+/106924 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/core/data/postit.cxx11
-rw-r--r--svx/source/svdraw/svdotxat.cxx7
2 files changed, 5 insertions, 13 deletions
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 7bb1b96eb2b4..bafd2e9e901b 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -382,17 +382,6 @@ 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 );
}
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<SdrRectObj *>(this)) { // this is a hack
pRectObj->SetXPolyDirty();
}
+ 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();