diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-09-30 10:11:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-09-30 10:16:33 +0100 |
| commit | d714e4583d0560fd0880fe4820e12f5a9114903c (patch) | |
| tree | 6414cbc2555a9454fadb67ae2daa1c4f92ee01a6 | |
| parent | c88523c9b2171c0b70a51142d8dbd456b8c36f4c (diff) | |
#i61927# bug from 2006linux-build-fridrich-20100930
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 62d02c0a2d..e017b99232 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -669,7 +669,14 @@ wwFont::wwFont(const String &rFamilyName, FontPitch ePitch, FontFamily eFamily, ShortToSVBT16( 400, &maWW8_FFN[2] ); // weiss ich nicht besser // 400 == FW_NORMAL (windows.h) - maWW8_FFN[4] = sw::ms::rtl_TextEncodingToWinCharset(eChrSet); + // + //#i61927# For unicode fonts like Arial Unicode, Word 97+ sets the chs + //to SHIFTJIS presumably to capture that it's a multi-byte encoding font + //but Word95 doesn't do this, and sets it to 0 (ANSI), so we should do the + //same + maWW8_FFN[4] = bWrtWW8 ? + sw::ms::rtl_TextEncodingToWinCharset(eChrSet) : + rtl_getBestWindowsCharsetFromTextEncoding(eChrSet); if (mbAlt) maWW8_FFN[5] = static_cast< BYTE >(msFamilyNm.Len() + 1); |