sw/source/core/txtnode/thints.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ab4ab2fe75010270d7a0ba3956c366cd9e991df0
Author: Clarence Guo <clarence_...@apache.org>
Date: Wed Jun 25 06:08:29 2014 +0000
Resolves: #i125154# numbering too small on sample .doc import
(cherry picked from commit fba2d04a09a2e040f36991f42062a1c5110fea13)
Conflicts:
sw/source/core/txtnode/thints.cxx
Change-Id: Idd086e20161fd5f3fd4c23f009c1a0f2061af07e
(cherry picked from commit db960181fe63efa28c2370505b2074d1db485e07)
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index cae6296..4932195 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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
