diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 07:31:20 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-11-03 07:31:20 +0000 |
| commit | 2dcc0c969168e218d321610d3860e1a5f718b204 (patch) | |
| tree | 455565567424624ff730316eef5abc512360b54e /vcl | |
| parent | 7c29f7db2e00afde2053a9bcde0c541ea0bd573e (diff) | |
INTEGRATION: CWS dr28 (1.184.4); FILE MERGED
2004/10/20 08:14:57 ssa 1.184.4.1: #i35764# make font color handling consistent, font default color is transparent now to force using the output device color, outdev color defaults to black
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 84a654456de0..f9f46da9323a 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outdev3.cxx,v $ * - * $Revision: 1.184 $ + * $Revision: 1.185 $ * - * last change: $Author: hr $ $Date: 2004-10-13 08:50:07 $ + * last change: $Author: pjunck $ $Date: 2004-11-03 08:31:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -5144,7 +5144,7 @@ void OutputDevice::SetFont( const Font& rNewFont ) // Optimization MT/HDU: COL_TRANSPARENT means SetFont should ignore the font color, // because SetTextColor() is used for this. // #i28759# maTextColor might have been changed behind our back, commit then, too. - if ( ( aFont.GetColor() != COL_TRANSPARENT && !aFont.IsTransparent() ) && + if ( aFont.GetColor() != COL_TRANSPARENT && ( maFont.GetColor() != aFont.GetColor() || aFont.GetColor() != maTextColor ) ) { maTextColor = aFont.GetColor(); |