diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-17 09:07:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-17 09:07:17 +0000 |
| commit | 137e4b301ff3482251592f1fb87f1a4401d1d545 (patch) | |
| tree | 5a46499a3b733c07b9612043c8b975baa9348d03 /vcl/unx/source/gdi | |
| parent | 9861019f4b6f78abe9e4d046eacb6085005fe6ff (diff) | |
INTEGRATION: CWS vcl18 (1.115.2); FILE MERGED
2004/02/17 11:20:25 hdu 1.115.2.1: #i25563# move X11 font size limit down one abstraction layer
Diffstat (limited to 'vcl/unx/source/gdi')
| -rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index aa22775b9ea3..ad787a42521e 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.116 $ + * $Revision: 1.117 $ * - * last change: $Author: obo $ $Date: 2004-02-20 09:00:33 $ + * last change: $Author: obo $ $Date: 2004-03-17 10:07:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -593,27 +593,6 @@ X11SalGraphics::SelectFont() //-------------------------------------------------------------------------- -// Select the max size of a font, which is token for real -// This routine is (and should be) called only once, the result should be -// stored in some static variable - -static int -GetMaxFontHeight() -{ - #define DEFAULT_MAXFONTHEIGHT 250 - - int nMaxFontHeight = 0; - - char *FontHeight = getenv ("SAL_MAXFONTHEIGHT"); - if (FontHeight) - nMaxFontHeight = atoi (FontHeight); - - if (nMaxFontHeight <= 0) - nMaxFontHeight = DEFAULT_MAXFONTHEIGHT; - - return nMaxFontHeight; -} - bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLevel ) { bFontVertical_ = pEntry->mbVertical; @@ -661,16 +640,6 @@ bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLev if( !pSysFont ) return false; Size aReqSize( pEntry->mnWidth, pEntry->mnHeight ); - if( bWindow_ ) - { - // see BugId #44528# FontWork (-> #45038#) and as well Bug #47127# - static int nMaxFontHeight = GetMaxFontHeight(); - if( aReqSize.Height() > nMaxFontHeight ) - aReqSize.Height() = nMaxFontHeight; - else if( aReqSize.Height() < 2 ) - aReqSize.Height() = 2; - } - mXFont[ nFallbackLevel ] = GetDisplay()->GetFont( pSysFont, aReqSize, bFontVertical_ ); return true; |