/[pkgs]/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
ViewVC logotype

Contents of /rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Thu Apr 9 12:08:49 2009 UTC (7 months, 2 weeks ago) by caolanm
Branch: MAIN
CVS Tags: openoffice_org-3_1_1-18_1_fc12, F-12-split, openoffice_org-3_1_1-16_1_fc12, openoffice_org-3_1_1-19_7_fc12, openoffice_org-3_1_1-19_9_fc12, openoffice_org-3_2_0-2_2_fc13, openoffice_org-3_1_1-19_6_fc12, openoffice_org-3_1_1-19_4_fc12, openoffice_org-3_1_1-19_5_fc12, openoffice_org-3_1_1-18_2_fc12, openoffice_org-3_1_1-14_1_fc12, openoffice_org-3_2_0-2_1_fc13, openoffice_org-3_2_0-4_2_fc13, openoffice_org-3_2_0-2_4_fc13, openoffice_org-3_1_1-12_1_fc12, openoffice_org-3_2_0-1_2_fc13, openoffice_org-3_2_0-4_1_fc13, openoffice_org-3_1_1-12_2_fc12, F-11-split, openoffice_org-3_1_1-13_1_fc12, openoffice_org-3_1_1-15_2_fc12, openoffice_org-3_1_1-19_1_fc12, openoffice_org-3_1_1-15_1_fc12, openoffice_org-3_1_0-11_3_fc12, openoffice_org-3_1_1-19_1_fc12_1, openoffice_org-3_1_1-17_1_fc12, openoffice_org-3_1_1-19_8_fc12, openoffice_org-3_2_0-2_3_fc13, openoffice_org-3_2_0-5_1_fc13, openoffice_org-3_2_0-3_1_fc13, openoffice_org-3_1_1-13_2_fc12, openoffice_org-3_2_0-3_2_fc13, openoffice_org-3_1_1-19_2_fc12, openoffice_org-3_1_0-9_3_fc12, openoffice_org-3_2_0-1_1_fc13, openoffice_org-3_1_1-16_2_fc12, openoffice_org-3_1_1-13_3_fc12, openoffice_org-3_2_0-2_5_fc13, openoffice_org-3_1_0-10_1_fc12, openoffice_org-3_2_0-3_4_fc13, openoffice_org-3_1_0-9_2_fc11, HEAD
File MIME type: text/x-patch 
Resolves: ooo#61927 ww6 unicode font encoding on export
1 Index: source/filter/ww8/wrtw8sty.cxx
2 ===================================================================
3 RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8sty.cxx,v
4 retrieving revision 1.49.44.2
5 diff -u -r1.49.44.2 wrtw8sty.cxx
6 --- openoffice.org.orig/sw/source/filter/ww8/wrtw8sty.cxx 12 Dec 2008 11:11:33 -0000 1.49.44.2
7 +++ openoffice.org/sw/source/filter/ww8/wrtw8sty.cxx 9 Apr 2009 12:02:50 -0000
8 @@ -621,7 +621,14 @@
9
10 ShortToSVBT16( 400, &maWW8_FFN[2] ); // weiss ich nicht besser
11 // 400 == FW_NORMAL (windows.h)
12 - maWW8_FFN[4] = sw::ms::rtl_TextEncodingToWinCharset(eChrSet);
13 + //
14 + //#i61927# For unicode fonts like Arial Unicode, Word 97+ sets the chs
15 + //to SHIFTJIS presumably to capture that it's a multi-byte encoding font
16 + //but Word95 doesn't do this, and sets it to 0 (ANSI), so we should do the
17 + //same
18 + maWW8_FFN[4] = bWrtWW8 ?
19 + sw::ms::rtl_TextEncodingToWinCharset(eChrSet) :
20 + rtl_getBestWindowsCharsetFromTextEncoding(eChrSet);
21
22 if (mbAlt)
23 maWW8_FFN[5] = static_cast< BYTE >(msFamilyNm.Len() + 1);
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2