From b88fe998ce8c80d7629fe70118311096615d959d Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 14 Feb 2013 17:43:25 +0100 Subject: use 'default character set' as the windows charset for unicode This is based on 2.8.2.2 from ECMA OOXML Part 4 and is a bit of a guess. I do not see why JIS should be the charset for everything that is unicode, and MSO2013 fails to read embedded fonts with w:charset set to this value. It seems to handle them when w:charset is set to this 'default character set', whatever that actually is. Without embedded fonts involved it moreover looks like w:charset does not actually matter. Change-Id: I7c083a0e39076313cd2687b1712420c92f691f5b --- sw/source/filter/ww8/writerwordglue.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index 2af44cdced7d..f8c3eef3ad0b 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -682,8 +682,7 @@ namespace sw case RTL_TEXTENCODING_UTF7: case RTL_TEXTENCODING_UTF8: case RTL_TEXTENCODING_JAVA_UTF8: - OSL_ENSURE(nRet != 0x80, "This method may be redundant"); - nRet = 0x80; + nRet = 0x01; break; default: break; -- cgit