diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-02-16 19:39:33 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-02-24 07:32:30 +0000 |
| commit | 0168e1eb65103afde24d4a2a62175946b1c0d33e (patch) | |
| tree | 015de37ef7b58bf444655b653a4b1e558614f27f /sw/inc/fmtcol.hxx | |
| parent | db115bec9254417ef7a3faf687478fe5424ab378 (diff) | |
tdf#78510 sw: combine items from SwTextNode and SwNumFormat
Tweak SwTextFormatColl::AreListLevelIndentsApplicable() and
SwTextNode::AreListLevelIndentsApplicable() to return a bitmask
so that SvxFirstLineIndentItem and SvxTextLeftMarginItem from paragraph
or numbering can be freely combined.
Particularly confusing was SwTextNode::GetLeftMarginWithNum()
and its baffling usage in SwTextMargin::CtorInitTextMargin(); it
appears easiest (if unintuitive) to interpret its return value as a
delta to be added to the paragraph's items.
This fixes the ODF interop problem.
It looks like no compat setting is needed because every OOo/LO generated
document should have either both fo:text-indent and fo:margin-left on a
paragraph style/list level, or neither.
Change-Id: If20b2556bb5ab5d915a2aa6633525bb44a9be33b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147166
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw/inc/fmtcol.hxx')
| -rw-r--r-- | sw/inc/fmtcol.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 6a477e1f5ca3..c914a6058ccf 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -143,7 +143,8 @@ public: return mbStayAssignedToListLevelOfOutlineStyle; } - bool AreListLevelIndentsApplicable() const; + ::sw::ListLevelIndents AreListLevelIndentsApplicable() const; + bool AreListLevelIndentsApplicableImpl(sal_uInt16 nWhich) const; void dumpAsXml(xmlTextWriterPtr pWriter) const; virtual void FormatDropNotify(const SwFormatDrop& rDrop) override |