summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-09 21:36:45 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2018-01-10 05:59:14 +0100
commitaa02ed306f7c633bbffede16e44e8e736977ace4 (patch)
tree154366b1a656a41a4b880f34573b3388c7c7acbd
parent0cc38c926eeafab2f8ddb21c2121d3d6aa7b90ae (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>
-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);
}
}
}