summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-09 21:36:45 +0100
committerAndras Timar <andras.timar@collabora.com>2018-03-15 23:03:46 +0100
commit70df28bca289cd3716b00638a03d4d860c3514ad (patch)
treed20b2effc6579c96bf85f5b6b86fc1e6a1cb26c4 /sw/source/core
parent983d8452423033a2220aca6bfab2fd7ab71500ba (diff)
tdf#106991: Highlighting remains after select no fill
Change-Id: I911970539b96bc0d1c6427829fcae869142c9010 Reviewed-on: https://gerrit.libreoffice.org/47679 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit aa02ed306f7c633bbffede16e44e8e736977ace4)
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/text/txtfld.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 6b2b9388644d..da9aadf13d03 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -440,7 +440,12 @@ static void checkApplyParagraphMarkFormatToNumbering( SwFont* pNumFnt, SwTextFor
pItem = aIter.NextItem();
}
}
+
+ // Highlightcolor also needed to be untoched, but we can't have that just by clearing the item
+ Color nSaveHighlight = pNumFnt->GetHighlightColor();
+
pNumFnt->SetDiffFnt(pCleanedSet.get(), pIDSA);
+ pNumFnt->SetHighlightColor(nSaveHighlight);
}
}
}