[Libreoffice-commits] core.git: sw/source

[Tamás Zolnai]

 sw/source/core/text/txtfld.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit aa02ed306f7c633bbffede16e44e8e736977ace4
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Tue Jan 9 21:36:45 2018 +0100

    tdf#106991: Highlighting remains after select no fill
    
    Change-Id: I911970539b96bc0d1c6427829fcae869142c9010
    Reviewed-on: https://gerrit.libreoffice.org/47679
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

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);
             }
         }
     }