svn commit: r1363207 - /incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par5.cxx

[leidb]

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;