Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AE5F2DBDE for ; Thu, 19 Jul 2012 02:16:51 +0000 (UTC) Received: (qmail 35845 invoked by uid 500); 19 Jul 2012 02:16:51 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 35790 invoked by uid 500); 19 Jul 2012 02:16:51 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 35780 invoked by uid 99); 19 Jul 2012 02:16:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2012 02:16:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jul 2012 02:16:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 63CFE23888EA; Thu, 19 Jul 2012 02:16:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1363207 - /incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx Date: Thu, 19 Jul 2012 02:16:31 -0000 To: ooo-commits@incubator.apache.org From: leidb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120719021631.63CFE23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: leidb Date: Thu Jul 19 02:16:30 2012 New Revision: 1363207 URL: http://svn.apache.org/viewvc?rev=1363207&view=rev Log: #119609# Fixed alphabetical and roman numberals became ditial numbering Reported by: Yan Ji Patch by: Chen Zuo Jun Review by: Lei De Bin Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx?rev=1363207&r1=1363206&r2=1363207&view=diff ============================================================================== --- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx (original) +++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx Thu Jul 19 02:16:30 2012 @@ -1453,7 +1453,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8 bFormat = true; // Format-Flag aktivieren bHidden = false; // Hidden-Flag deaktivieren nRet = aReadParam.SkipToNextToken(); - if( -2 == nRet ) + if( -2 == nRet && !( aReadParam.GetResult().EqualsAscii("MERGEFORMAT") || aReadParam.GetResult().EqualsAscii("CHARFORMAT") )) eNumFormat = GetNumTypeFromName( aReadParam.GetResult() ); break;