summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2023-11-22 12:05:14 +0100
committerThorsten Behrens <thorsten.behrens@allotropia.de>2023-12-06 15:24:57 +0100
commit5de53775531a358c6775d265a3a19699c96a8139 (patch)
tree981067b81e15ff4989ca9059ac9d83dac5b0a762
parent968166ba4ee96f7c9053c8f4c88ac82381ff7cf4 (diff)
tdf#154369 don't apply default items to numbering symbols
default attributes from the CharFmt should no be applied to the numbering symbol Change-Id: Ifa2d2ace575b888a43fa948f3b71605cfe20f129 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159817 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
-rw-r--r--sw/source/core/text/txtfld.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 2cffd26eeef7..84f32e30971f 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -351,7 +351,8 @@ static void checkApplyParagraphMarkFormatToNumbering(SwFont* pNumFnt, SwTextForm
{
if (!SwTextNode::IsIgnoredCharFormatForNumbering(nWhich, /*bIsCharStyle=*/true)
&& !pCleanedSet->HasItem(nWhich)
- && !(pFormat && pFormat->HasItem(nWhich)) )
+ && !(pFormat && pFormat->HasItem(nWhich))
+ && rStyleAttrs.GetItemState(nWhich) > SfxItemState::DEFAULT)
{
// Copy from parent sets only allowed items which will not overwrite
// values explicitly defined in current set (pCleanedSet) or in pFormat