cui/source/tabpages/align.cxx | 6 +++++-
editeng/inc/strings.hrc | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 6156d2fa9f67469d55fc9d01632e6d33a698fdf6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 10 20:11:04 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 11 12:26:56 2019 +0100
Related: tdf#129300 make Automatic/Distributed state what is automatic
Change-Id: Ib246479761556858e92052edf86a18753d44c583
Reviewed-on: https://gerrit.libreoffice.org/84893
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 77b325d9f81b..44203405b9ff 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -315,7 +315,6 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
// Special treatment for distributed alignment; we need to set the justify
// method to 'distribute' to distinguish from the normal justification.
-
sal_uInt16 nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD);
lcl_SetJustifyMethodToItemSet(*rSet, nWhichHorJM, *m_xLbHorAlign,
ALIGNDLG_HORALIGN_DISTRIBUTED);
if (!bChanged)
diff --git a/editeng/inc/strings.hrc b/editeng/inc/strings.hrc
index 7982997116b8..7ed30a3ef599 100644
--- a/editeng/inc/strings.hrc
+++ b/editeng/inc/strings.hrc
@@ -36,8 +36,8 @@ const char* RID_SVXITEMS_VERJUST[] =
const char* RID_SVXITEMS_JUSTMETHOD[] =
{
// enum SvxCellJustifyMethod
----------------------------------------------------
- NC_("RID_SVXITEMS_JUSTMETHOD_AUTO", "Automatic"),
- NC_("RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE", "Distributed")
+ NC_("RID_SVXITEMS_JUSTMETHOD_AUTO", "Automatic Justify"),
+ NC_("RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE", "Distributed Justify")
};
#endif
commit 2f13f0693de4c301898f304999225738334aadb0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 10 20:15:27 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 11 12:26:43 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/84894
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7e68685beee2..77b325d9f81b 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -92,6 +92,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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
