diff options
| author | Jian Hong Cheng <chengjh@apache.org> | 2012-09-04 06:09:46 +0000 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-04-07 23:37:38 +0200 |
| commit | 67f9ccaebf0f79f9e51717d5365aee1b9bcbd486 (patch) | |
| tree | 146cb76ef7218135de965e800848c76bf3919eef | |
| parent | 7a90044df279e1ec2336e7c398fa938a6fa3ad56 (diff) | |
Fix issue #i120769: Color of underline display wrongly
* sw/source/core/text/itrpaint.cxx
Core function and MS Word Binary compatibility
Patch by: Jane Kang,<kangjane2012@gmail.com>
Found by: Yan Ji,<yanji.yj@gmail.com>
Review by: Jian Hong Cheng,<chengjh@apache.org> (cherry picked from commit 70f7599d7ec5f3c14a42cd5dc94519fead070cfd)
| -rw-r--r-- | sw/source/core/text/itrpaint.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 981c2dfabf70..3043bf4113bd 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -497,11 +497,13 @@ void SwTxtPainter::CheckSpecialUnderline( const SwLinePortion* pPor, // If current underline matches the common underline font, we continue // to use the common underline font. + //Bug 120769:Color of underline display wrongly + Color aAutoCo(COL_AUTO); if ( GetInfo().GetUnderFnt() && - GetInfo().GetUnderFnt()->GetFont().GetUnderline() == - GetFnt()->GetUnderline() ) - return; - + GetInfo().GetUnderFnt()->GetFont().GetUnderline() == GetFnt()->GetUnderline() && + GetInfo().GetFont() && GetInfo().GetFont()->GetUnderColor() != aAutoCo ) + return; + //Bug 120769(End) // calculate the new common underline font SwFont* pUnderlineFnt = 0; Point aCommonBaseLine; |