summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-05-28 10:50:27 +0200
committerJulien Nabet <serval2412@yahoo.fr>2019-05-29 14:43:20 +0200
commitfd01ddd3094dd080a455665342316c79dbee8390 (patch)
tree4fa12df6f8f14961debefb38fee18ad5098a48c7
parent1ee156ba9ff0471266e04f5cf7b4ceed1a6b5e87 (diff)
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 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 04b65f16c3f9..67b25521ff43 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2822,7 +2822,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();