diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-13 07:50:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-10-13 07:50:07 +0000 |
| commit | abb93c957ee20b7478286d6d1165e08e01a89db0 (patch) | |
| tree | 69088ab1138247cb68e329c977c2701f3130af2f /vcl/source | |
| parent | 20df8af115b98b84158a0a3d881ef8bef22709b5 (diff) | |
INTEGRATION: CWS vcl27 (1.180.10); FILE MERGED
2004/09/17 15:04:24 pl 1.180.10.5: RESYNC: (1.180-1.183); FILE MERGED
2004/09/10 11:33:14 hdu 1.180.10.4: #i27480# text background width is in pixel units
2004/09/09 14:13:24 hdu 1.180.10.3: #i33947# try EUDC as default font for Gaiji support
2004/09/08 15:20:21 ssa 1.180.10.2: #i33770# extend font transparency check to avoid fontcolors overwriting the textcolor
2004/09/07 16:29:44 pl 1.180.10.1: #i33922# support multiple fax numbers in one document
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index a986f423496c..84a654456de0 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outdev3.cxx,v $ * - * $Revision: 1.183 $ + * $Revision: 1.184 $ * - * last change: $Author: hr $ $Date: 2004-09-08 16:07:56 $ + * last change: $Author: hr $ $Date: 2004-10-13 08:50:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3004,6 +3004,7 @@ ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList, { // TODO: implement dynamic lists or improve static lists #define FALLBACKFONT_NAMELIST \ + "eudc;" \ "arialunicodems;andalesansui;cyberbit;starsymbol;opensymbol;lucidatypewriter;" \ "msmincho;fzmingti;sunbatang;sundotum;baekmukdotum;" \ "kochimincho;sazanamimincho;" \ @@ -3505,7 +3506,7 @@ void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY, void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout ) { - long nWidth = rSalLayout.GetTextWidth(); + long nWidth = rSalLayout.GetTextWidth() / rSalLayout.GetUnitsPerPixel(); Point aBase = rSalLayout.GetDrawPosition(); long nX = aBase.X(); long nY = aBase.Y(); @@ -5143,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 ) && + if ( ( aFont.GetColor() != COL_TRANSPARENT && !aFont.IsTransparent() ) && ( maFont.GetColor() != aFont.GetColor() || aFont.GetColor() != maTextColor ) ) { maTextColor = aFont.GetColor(); |