blob: 793e8488f12c9e1149d1af3ee863f8846a5db255 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- ../sw/source/filter/ww8/ww8par.cxx.orig 2003-02-07 01:34:02.000000000 +0900
+++ ../sw/source/filter/ww8/ww8par.cxx 2003-04-10 07:04:46.000000000 +0900
@@ -1558,11 +1558,20 @@
if (bVer67)
{
sal_Char aTest[2];
- aTest[0] = (nUCode & 0xFF00) >> 8;
- aTest[1] = (nUCode & 0x00FF);
- String aTemp(aTest, 2, eSrcCharSet);
- ASSERT(aTemp.Len() == 1, "so much for that theory");
- *pWork = aTemp.GetChar(0);
+ if (nUCode >= 0x3000)
+ {
+ aTest[0] = (nUCode & 0xFF00) >> 8;
+ aTest[1] = (nUCode & 0x00FF);
+ String aTemp(aTest, 2, eSrcCharSet);
+ ASSERT(aTemp.Len() == 1, "so much for that theory");
+ *pWork = aTemp.GetChar(0);
+ }
+ else
+ {
+ aTest[0] = (nUCode & 0x00FF);
+ String aTemp(aTest, 1, eSrcCharSet);
+ *pWork = aTemp.GetChar(0);
+ }
}
else
*pWork = nUCode;
@@ -3099,7 +3108,8 @@
{
case 6:
case 7:
- if ( (0xa5dc != nMagic) && (0xa699 != nMagic) )
+ //if ( (0xa5dc != nMagic) && (0xa699 != nMagic) ) //Takashi Ono
+ if ( (0xa5dc != nMagic) && ( (0xa697 > nMagic) || (0xa699 < nMagic) ) )
{
//JP 06.05.99: teste auf eigenen 97-Fake!
if (pStg && 0xa5ec == nMagic)
|
