openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clarence_...@apache.org
Subject svn commit: r1605274 - /openoffice/trunk/main/sw/source/core/txtnode/thints.cxx
Date Wed, 25 Jun 2014 06:08:29 GMT
Author: clarence_guo
Date: Wed Jun 25 06:08:29 2014
New Revision: 1605274

URL: http://svn.apache.org/r1605274
Log:
Fix issue 125154

Modified:
    openoffice/trunk/main/sw/source/core/txtnode/thints.cxx

Modified: openoffice/trunk/main/sw/source/core/txtnode/thints.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/txtnode/thints.cxx?rev=1605274&r1=1605273&r2=1605274&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/txtnode/thints.cxx (original)
+++ openoffice/trunk/main/sw/source/core/txtnode/thints.cxx Wed Jun 25 06:08:29 2014
@@ -1790,10 +1790,10 @@ void SwTxtNode::DelSoftHyph( const xub_S
 }
 
 //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(co
 //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);
 }



Mime
View raw message