diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-12-04 15:39:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-12-04 15:39:44 +0000 |
| commit | 290ca51fcac596518413d255c5773868de191c74 (patch) | |
| tree | f9b868397de4a992cd00972966a6384d28d687cc /vcl/unx | |
| parent | 61de275fec4ca7633131601f3a91da7fcc3ca94d (diff) | |
INTEGRATION: CWS vcl69 (1.140.32); FILE MERGED
2006/11/21 13:02:25 pl 1.140.32.3: RESYNC: (1.140-1.141); FILE MERGED
2006/11/16 17:00:05 pl 1.140.32.2: #i71533# revised XError handling
2006/10/30 11:29:10 hdu 1.140.32.1: #i62039# good bye native X11 fonts
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index d68541bdd801..4152fb393eb0 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.141 $ + * $Revision: 1.142 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 15:26:08 $ + * last change: $Author: rt $ $Date: 2006-12-04 16:39:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -855,8 +855,7 @@ bool X11SalGraphics::DrawServerAAForcedString( const ServerFontLayout& rLayout ) } // get XImage - bool bOldXErrorEnabled = GetDisplay()->GetXLib()->GetIgnoreXErrors(); - GetDisplay()->GetXLib()->SetIgnoreXErrors( true ); + GetDisplay()->GetXLib()->PushXErrorLevel( true ); Display* pDisplay = GetXDisplay(); XRectangle aXRect; @@ -956,7 +955,7 @@ bool X11SalGraphics::DrawServerAAForcedString( const ServerFontLayout& rLayout ) } if( pImg == NULL ) { - GetDisplay()->GetXLib()->SetIgnoreXErrors( bOldXErrorEnabled ); + GetDisplay()->GetXLib()->PopXErrorLevel(); return false; } } @@ -1037,7 +1036,7 @@ bool X11SalGraphics::DrawServerAAForcedString( const ServerFontLayout& rLayout ) 0, 0, nXmin, nYmin, (nXmax - nXmin + 1), (nYmax - nYmin + 1) ); XDestroyImage( pImg ); - GetDisplay()->GetXLib()->SetIgnoreXErrors( bOldXErrorEnabled ); + GetDisplay()->GetXLib()->PopXErrorLevel(); return true; } @@ -1255,7 +1254,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList ) { // allow disabling of native X11 fonts static const char* pEnableX11FontStr = getenv( "SAL_ENABLE_NATIVE_XFONTS" ); - if( !pEnableX11FontStr || (pEnableX11FontStr[0] != '0') ) + if( pEnableX11FontStr && (pEnableX11FontStr[0] == '1') ) { // announce X11 fonts XlfdStorage* pX11FontList = GetDisplay()->GetXlfdList(); |