diff options
author | Clarence Guo <clarence_guo@apache.org> | 2014-06-25 06:08:29 +0000 |
---|---|---|
committer | Clarence Guo <clarence_guo@apache.org> | 2014-06-25 06:08:29 +0000 |
commit | fba2d04a09a2e040f36991f42062a1c5110fea13 (patch) | |
tree | 0e5549d99e9a25e406b1ca29d238754637c0acf7 /sw/source/core | |
parent | c0f03c75c71dde47e210ca23eefe3c879b89d97c (diff) |
Fix issue 125154
Notes
merged as: db960181fe63efa28c2370505b2074d1db485e07
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 66781e075112..19fe3e5314d3 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1790,10 +1790,10 @@ void SwTxtNode::DelSoftHyph( const xub_StrLen nStt, const xub_StrLen nEnd ) } //Modify here for #119405, by easyfan, 2012-05-24 -//In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it +//In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, escapement, etc, so we ignore them bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich) { - return (nWhich == RES_CHRATR_UNDERLINE); + return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_ESCAPEMENT); } //In MS Word, following properties of the paragraph end position wont affect the formatting of bullets, so we ignore them: @@ -1802,7 +1802,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); } |