incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1380463 - /incubator/ooo/trunk/main/sw/source/core/text/itrpaint.cxx
Date Tue, 04 Sep 2012 07:09:47 GMT
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,<kangjane2012@gmail.com>
Found by: Yan Ji,<yanji.yj@gmail.com>
Review by: Jian Hong Cheng,<chengjh@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;



Mime
View raw message