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

[Caolán McNamara (via logerrit)]

 sw/source/filter/html/htmlcss1.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c551e34018d7392f44ff8d7216dda4a480c6eea7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Jul 3 21:20:18 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jul 4 17:46:14 2021 +0200

    ofz#33258 don't set a replacement font if the current one is the same
    
    5.602s->4.022s
    
    Change-Id: I5983d4f51bda7249f7b37d642dd970f01b70d3aa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118365
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index f241b396dfce..267996f4ea01 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2286,6 +2286,8 @@ static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc )
         const SvxFontItem& rFont = *static_cast<const SvxFontItem*>(pItem);
         if (RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet())
             continue;
+        if (eEnc == rFont.GetCharSet())
+            continue;
         SvxFontItem aFont(rFont.GetFamily(), rFont.GetFamilyName(),
                           rFont.GetStyleName(), rFont.GetPitch(),
                           eEnc, i);