[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/align.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 0476613b0150b706cbff80d08c6983793c7fd612
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 10 20:15:27 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Dec 12 04:07:06 2019 +0100

    tdf#129300 If it would create no change, don't force it
    
    otherwise a bogus "change" from the parent style is shown in the organizer
    
    this dates to...
    
    commit 755ad6834625488c5d31d4bacc9370eae7ffd8f3
    Date:   Tue Oct 5 11:15:56 2010 -0400
    
        Ported calc-distributed-cell-text-*.diff from ooo-build.
    
    Change-Id: I49fc654a232d3c0f43f8add9a9f9fee34a6c5add
    Reviewed-on: https://gerrit.libreoffice.org/84895
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/84985
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index b4f1a2b9ad73..559cb88755a3 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -98,6 +98,11 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const
     if (rLB.get_active() == nListPos)
         eJM = SvxCellJustifyMethod::Distribute;
 
+    // tdf#129300 If it would create no change, don't force it
+    const SvxJustifyMethodItem& rOldItem = static_cast<const SvxJustifyMethodItem&>(rSet.Get(nWhichJM));
+    if (rOldItem.GetValue() == eJM)
+        return;
+
     SvxJustifyMethodItem aItem(eJM, nWhichJM);
     rSet.Put(aItem);
 }