You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ch...@apache.org on 2012/09/04 09:09:47 UTC
svn commit: r1380463 -
/incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx
Author: chengjh
Date: Tue Sep 4 07:09:46 2012
New Revision: 1380463
URL: http://svn.apache.org/viewvc?rev=1380463&view=rev
Log:
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,<ka...@gmail.com>
Found by: Yan Ji,<ya...@gmail.com>
Review by: Jian Hong Cheng,<ch...@apache.org>
Modified:
incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx
Modified: incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx?rev=1380463&r1=1380462&r2=1380463&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx Tue Sep 4 07:09:46 2012
@@ -521,11 +521,13 @@ void SwTxtPainter::CheckSpecialUnderline
// 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;