diff options
| author | Clarence Guo <clarence_guo@apache.org> | 2014-06-25 06:08:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-25 11:13:43 +0100 |
| commit | db960181fe63efa28c2370505b2074d1db485e07 (patch) | |
| tree | 3dbfa6f701a9bc7349fd6de30a67fccf49125049 /sw | |
| parent | f1ee11ce499f02eda7fdd783901f1ad62eac0bc7 (diff) | |
Resolves: #i125154# numbering too small on sample .doc import
(cherry picked from commit fba2d04a09a2e040f36991f42062a1c5110fea13)
Conflicts:
sw/source/core/txtnode/thints.cxx
Change-Id: Idd086e20161fd5f3fd4c23f009c1a0f2061af07e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |