From db960181fe63efa28c2370505b2074d1db485e07 Mon Sep 17 00:00:00 2001 From: Clarence Guo Date: Wed, 25 Jun 2014 06:08:29 +0000 Subject: Resolves: #i125154# numbering too small on sample .doc import (cherry picked from commit fba2d04a09a2e040f36991f42062a1c5110fea13) Conflicts: sw/source/core/txtnode/thints.cxx Change-Id: Idd086e20161fd5f3fd4c23f009c1a0f2061af07e --- sw/source/core/txtnode/thints.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sw') diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 294f28af0034..465a7c5816c0 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1764,7 +1764,7 @@ void SwTxtNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd ) //In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich) { - return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND); + return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND || nWhich == RES_CHRATR_ESCAPEMENT); } //In MS Word, following properties of the paragraph end position wont affect the formatting of bullets, so we ignore them: @@ -1773,7 +1773,7 @@ bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich) //Font Bold of Wertern, CJK and CTL; bool lcl_IsIgnoredCharFmtForBullets(const sal_uInt16 nWhich) { - return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_POSTURE || nWhich == RES_CHRATR_WEIGHT + return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_POSTURE || nWhich == RES_CHRATR_WEIGHT || nWhich == RES_CHRATR_CJK_POSTURE || nWhich == RES_CHRATR_CJK_WEIGHT || nWhich == RES_CHRATR_CTL_POSTURE || nWhich == RES_CHRATR_CTL_WEIGHT); } -- cgit v1.2.3