Kaydet (Commit) baf57431 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Miklos Vajna

tdf#56738: fix encoding in comments in doc files (>= Word 97)

See https://bugs.documentfoundation.org/show_bug.cgi?id=56738#c3

Change-Id: I8dbab3fe76b2c2d83cbb07509fabe9f784664c03
Reviewed-on: https://gerrit.libreoffice.org/73088
(cherry picked from commit fd01ddd3)
Reviewed-on: https://gerrit.libreoffice.org/73157
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst ed200895
......@@ -2809,7 +2809,9 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
rtl_TextEncoding eSrcCharSet = m_eHardCharSet;
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
{
if (!m_aFontSrcCharSets.empty())
if (!m_bVer67)
eSrcCharSet = GetCharSetFromLanguage();
else if (!m_aFontSrcCharSets.empty())
eSrcCharSet = m_aFontSrcCharSets.top();
if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() )
eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment