[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source svx/source

[Caolán McNamara (via logerrit)]

 sc/source/core/data/postit.cxx |    3 +++
 svx/source/svdraw/svdotxat.cxx |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0d36233d4555b5f160a407328661825eb9305c98
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 18 17:09:52 2020 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Nov 19 02:17:40 2020 +0100

    Resolves: tdf#114956 skip broadcast optimization for ScPostIts
    
    so we can resize the ScPostIt as was the case before
    
    commit f06b48a5dddab20fd1bbf9b5f3e8543593f5e590
    Date:   Fri Aug 4 18:56:43 2017 +0200
    
        editviewoverlay: Allow EditView to run in Overlay
    
    Change-Id: Idd92716a9b38058f6f275769d4f2523eddac500c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106005
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index d0ac658f3e35..9ccb6c31a8f5 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -382,6 +382,9 @@ 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
+    mxCaption->SetName("ScPostIt");
     // basic caption settings
     ScCaptionUtil::SetBasicCaptionSettings( *mxCaption, bShown );
 }
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 6f4559fd33ca..6f97960b5377 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -278,7 +278,8 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
             GetTextEditOutliner() &&
             GetTextEditOutliner()->hasEditViewCallbacks());
 
-        if (!bSuppressChangeWhenEditOnOverlay)
+        // tdf#114956 always broadcast change for ScPostIts
+        if (!bSuppressChangeWhenEditOnOverlay || GetName() == "ScPostIt")
         {
             SetChanged();
             BroadcastObjectChange();