[PATCH] use 'default character set' as the windows charset for unico...

[Luboš Luňák (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2153

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/2153/1

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
---
M sw/source/filter/ww8/writerwordglue.cxx
1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 2af44cd..f8c3eef 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -682,8 +682,7 @@
                 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;

-- 
To view, visit https://gerrit.libreoffice.org/2153
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c083a0e39076313cd2687b1712420c92f691f5b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luboš Luňák <l.lunak at suse.cz>