summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei De Bin <leidb@apache.org>2012-07-19 01:16:30 +0000
committerXisco Fauli <anistenis@gmail.com>2013-03-31 16:22:33 +0200
commitf13cff6d71d237068c6af92eda271e5fc144be5a (patch)
tree8fb657ee724491dc703972a54a2344f0a335015f
parent4313d73f1436f87d937ba10ee05b32bd363b125e (diff)
#119609# Fixed alphabetical and roman numberals became ditial numbering
Reported by: Yan Ji Patch by: Chen Zuo Jun Review by: Lei De Bin
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 97a6641b2c31..2b9316156751 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1542,7 +1542,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, String& rStr )
case '*':
nRet = aReadParam.SkipToNextToken();
- if( -2 == nRet )
+ if( -2 == nRet && !( aReadParam.GetResult().EqualsAscii("MERGEFORMAT") || aReadParam.GetResult().EqualsAscii("CHARFORMAT") ))
eNumFormat = GetNumTypeFromName( aReadParam.GetResult() );
break;