diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-05 17:49:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-05 17:49:45 +0000 |
| commit | a99237ba49d1d84dcff274f8baca46b4e7f940aa (patch) | |
| tree | b6cd12d7cbc0c0a22e058cfe4b16d47b10c6d367 /cppcanvas/source/mtfrenderer/textaction.cxx | |
| parent | 347a1622743363ae11cd12bc00d5827c5c952f79 (diff) | |
CWS-TOOLING: integrate CWS overline3
2008-12-11 15:24:46 +0100 fredrikh r265314 : i97099
2008-12-11 15:20:37 +0100 fredrikh r265313 : i97099
2008-12-11 15:18:00 +0100 fredrikh r265312 : i97099
2008-12-11 15:17:00 +0100 fredrikh r265311 : i97099
2008-12-11 15:13:20 +0100 fredrikh r265309 : i97144
2008-12-11 15:06:24 +0100 fredrikh r265306 : i97099
2008-11-24 10:41:42 +0100 fme r264213 : #i5991# Overline support
2008-11-24 10:39:53 +0100 fme r264212 : #i5991# Overline support
2008-11-24 10:02:13 +0100 fme r264209 : #5991# Overline support
2008-11-24 10:01:26 +0100 fme r264208 : #5991# Overline support
2008-11-24 09:59:11 +0100 fme r264207 : #5991# Overline support
2008-11-24 09:57:11 +0100 fme r264206 : #5991# Overline support
2008-11-14 10:36:44 +0100 fme r263667 : CWS-TOOLING: rebase CWS overline3 to trunk@263288 (milestone: DEV300:m35)
2008-11-13 16:12:13 +0100 fme r263649 : #i5991# migrate CWS overline3 to SVN.
Diffstat (limited to 'cppcanvas/source/mtfrenderer/textaction.cxx')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 66bf728418c1..f1191e6e57f3 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: textaction.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.4.1 $ * * This file is part of OpenOffice.org. * @@ -2183,7 +2183,8 @@ namespace cppcanvas if( !pDXArray && !bSubsettable ) { // effects, or not? - if( !rState.textUnderlineStyle && + if( !rState.textOverlineStyle && + !rState.textUnderlineStyle && !rState.textStrikeoutStyle && rReliefColor == aEmptyColor && rShadowColor == aEmptyColor ) @@ -2246,7 +2247,8 @@ namespace cppcanvas else { // DX array necessary - any effects? - if( !rState.textUnderlineStyle && + if( !rState.textOverlineStyle && + !rState.textUnderlineStyle && !rState.textStrikeoutStyle && rReliefColor == aEmptyColor && rShadowColor == aEmptyColor ) |