From d8951bebc7ec52f6233ce7407f695520632b417b Mon Sep 17 00:00:00 2001 From: "ftang%netscape.com" Date: Wed, 7 Apr 1999 00:32:49 +0000 Subject: [PATCH] fix the ignore 1 for 10 problem for cjk-ideographics style git-svn-id: svn://10.0.0.236/trunk@26633 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBulletFrame.cpp | 3 ++- mozilla/layout/html/base/src/nsBulletFrame.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index 1e89f31a704..63609ffae77 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -429,7 +429,8 @@ static void CJKIdeographicToText(PRInt32 ordinal, nsString& result, buf[--idx] = c10kUnit; if(0 != cUnit) buf[--idx] = cUnit; - if((0 != cDigit) && ( 1 == (ud%4)) && (ordinal < 10)) + if((0 != cDigit) && + ( (1 != cur) || (1 != (ud%4)) || ( ordinal > 10)) ) buf[--idx] = cDigit; c10kUnit = 0; diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index 1e89f31a704..63609ffae77 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -429,7 +429,8 @@ static void CJKIdeographicToText(PRInt32 ordinal, nsString& result, buf[--idx] = c10kUnit; if(0 != cUnit) buf[--idx] = cUnit; - if((0 != cDigit) && ( 1 == (ud%4)) && (ordinal < 10)) + if((0 != cDigit) && + ( (1 != cur) || (1 != (ud%4)) || ( ordinal > 10)) ) buf[--idx] = cDigit; c10kUnit = 0;