diff options
| author | th <th@openoffice.org> | 2001-04-06 11:48:42 +0000 |
|---|---|---|
| committer | th <th@openoffice.org> | 2001-04-06 11:48:42 +0000 |
| commit | 242b0c50d6982709e7f38a19423e92df15d1fcff (patch) | |
| tree | f09916b8e155de15b940be7224e743ea4901375f /vcl/source/window/window2.cxx | |
| parent | 4c861b8bf4b83c051d7a48be09fb778de9e21d44 (diff) | |
#80306# - New Fontmapping (now also for CJK fonts)
Diffstat (limited to 'vcl/source/window/window2.cxx')
| -rw-r--r-- | vcl/source/window/window2.cxx | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 6fc297a1cfa0..5df0288cfbf0 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: window2.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:05:40 $ + * last change: $Author: th $ $Date: 2001-04-06 12:48:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1009,24 +1009,14 @@ void Window::SetZoomedPointFont( const Font& rFont ) long nFontDiff = Abs( GetFont().GetSize().Height()-aMetric.GetSize().Height() ); if ( (aMetric.GetType() == TYPE_RASTER) && (nFontDiff >= 2) ) { - ImplDevFontListData* pStdFont = NULL; - USHORT nStdFont = 0xFFFF; + USHORT nType; if ( aMetric.GetPitch() == PITCH_FIXED ) - nStdFont = PITCH_FIXED; - else if ( aMetric.GetFamily() == FAMILY_SWISS ) - nStdFont = IMPL_STDFONT_SWISS; - else if ( aMetric.GetFamily() == FAMILY_ROMAN ) - nStdFont = IMPL_STDFONT_ROMAN; - if ( nStdFont != 0xFFFF ) - { - if ( mpFontList ) - pStdFont = mpFontList->GetStandardFont( nStdFont ); - if ( pStdFont && (aFont.GetName() != pStdFont->maName) ) - { - aFont.SetName( pStdFont->maName ); - SetPointFont( aFont ); - } - } + nType = FONT_DEFAULT_FIXED; + else + nType = FONT_DEFAULT_UI_SANS; + Font aTempFont = GetDefaultFont( nType, GetSettings().GetInternational().GetLanguage(), FALSE ); + aFont.SetName( aTempFont.GetName() ); + SetPointFont( aFont ); } } else |