diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-14 17:15:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-14 17:15:26 +0000 |
| commit | 1c36c112707677fe89e427b3baf93c7c0b78d17d (patch) | |
| tree | 99d3800482191fc75fa93f4664274e037436daeb /i18npool/source/inputchecker | |
| parent | 7e6365efdd662817e153aa9e0962a7b626e4a04e (diff) | |
CWS-TOOLING: integrate CWS cmcfixes55
2009-03-03 10:04:14 +0100 cmc r268711 : #i99765# silence warning
2009-03-02 12:18:48 +0100 cmc r268647 : #i99772# silence warnings under >= python 2.6 and gcc 4.4
2009-03-02 10:51:12 +0100 cmc r268641 : #i99767# fix up trivial && ||
2009-03-02 10:32:02 +0100 cmc r268640 : #i99766 remove && || warning
2009-03-02 10:01:05 +0100 cmc r268638 : #i99764# easy && || warnings
2009-02-27 13:03:08 +0100 cmc r268583 : #i96059# fix dodgy code
2009-02-27 12:57:38 +0100 cmc r268582 : #i99718# don't leave unused methods on non-win platform
Diffstat (limited to 'i18npool/source/inputchecker')
| -rw-r--r-- | i18npool/source/inputchecker/inputsequencechecker_th.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index 7da4a7e5b73f..815431368237 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -122,19 +122,19 @@ http://www.openoffice.org/issues/show_bug.cgi?id=42661 8. <cons> <thanthakhat> + <abv1> => <cons> <abv1> <thanthakhat> (reorder) 9. <cons> <abv1>_x <thanthakhat> + <abv1>_y => <cons> <abv1>_y <thanthakhat>(reorder, replace) */ -#define CT_ABV(t) (t>=CT_AV1 && t<=CT_AV3 || t==CT_BV1 || t==CT_BV2) +#define CT_ABV(t) ( (t>=CT_AV1 && t<=CT_AV3) || t==CT_BV1 || t==CT_BV2) #define CT_ABV1(t) (t==CT_AV1 || t==CT_BV1) if (check(Text[nStartPos], inputChar, inputCheckMode)) Text = Text.replaceAt(++nStartPos, 0, OUString(inputChar)); else if (nStartPos > 0 && getCharType(Text[nStartPos-1]) == CT_CONS) { sal_uInt16 t1=getCharType(Text[nStartPos]), t2=getCharType(inputChar); - if (CT_ABV(t1) && CT_ABV(t2) || // 1. - t1==CT_TONE && t2==CT_TONE) // 2. + if ( (CT_ABV(t1) && CT_ABV(t2)) || // 1. + (t1==CT_TONE && t2==CT_TONE) )// 2. Text = Text.replaceAt(nStartPos, 1, OUString(inputChar)); - else if (t1==CT_TONE && CT_ABV(t2) || // 5. - t1==CT_FV1 && t2==CT_TONE || // 6. - Text[nStartPos]==0x0E4C && CT_ABV1(t2)) // 8. + else if ( (t1==CT_TONE && CT_ABV(t2)) || // 5. + (t1==CT_FV1 && t2==CT_TONE) || // 6. + (Text[nStartPos]==0x0E4C && CT_ABV1(t2)) ) // 8. Text = Text.replaceAt(nStartPos++, 0, OUString(inputChar)); else nStartPos=Text.getLength(); @@ -142,9 +142,9 @@ http://www.openoffice.org/issues/show_bug.cgi?id=42661 sal_uInt16 t1=getCharType(Text[nStartPos-1]), t2=getCharType(Text[nStartPos]), t3=getCharType(inputChar); if (CT_ABV(t1) && t2==CT_TONE && t3==CT_TONE) // 3. Text = Text.replaceAt(nStartPos, 1, OUString(inputChar)); - else if (CT_ABV(t1) && t2==CT_TONE && CT_ABV(t3) || // 4. - t1==CT_TONE && t2==CT_FV1 && t3==CT_TONE || // 7. - CT_ABV1(t1) && Text[nStartPos]==0x0E4C && CT_ABV1(t3)) // 9. + else if ( (CT_ABV(t1) && t2==CT_TONE && CT_ABV(t3)) || // 4. + (t1==CT_TONE && t2==CT_FV1 && t3==CT_TONE) || // 7. + (CT_ABV1(t1) && Text[nStartPos]==0x0E4C && CT_ABV1(t3)) ) // 9. Text = Text.replaceAt(nStartPos-1, 1, OUString(inputChar)); else nStartPos=Text.getLength(); |