diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:26:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 10:26:50 +0000 |
| commit | 40a8169c38b65a4cbce3a3141c2d3c0290a8d8bc (patch) | |
| tree | 0672c0da8cc26b5cef1d5615c58420f5dfa16023 /vcl | |
| parent | be85624c2416c0cb85405f8f49d03b01562fac13 (diff) | |
INTEGRATION: CWS vcl71 (1.83.6); FILE MERGED
2007/01/11 16:40:56 hdu 1.83.6.4: #i72678# heuristic for CJK font metrics should ignore combining half marks
2007/01/11 16:22:05 hdu 1.83.6.3: #i72678# fix typo in heuristic for CJK font metrics
2007/01/10 13:43:50 pl 1.83.6.2: RESYNC: (1.83-1.84); FILE MERGED
2006/12/20 07:41:39 hdu 1.83.6.1: #i72707# post WM_FONTCHANGE message only for non-private fonts
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 99eff2afe6b4..48eb7e191a09 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.84 $ + * $Revision: 1.85 $ * - * last change: $Author: ihi $ $Date: 2006-12-20 18:33:17 $ + * last change: $Author: obo $ $Date: 2007-01-25 11:26:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -892,12 +892,13 @@ void ImplWinFontData::ReadOs2Table( HDC hDC ) // to have access to the needed struct members. sal_uInt32 ulUnicodeRange1 = GetUInt( pOS2map + 42 ); sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 ); +#if 0 sal_uInt32 ulUnicodeRange3 = GetUInt( pOS2map + 50 ); - //sal_uInt32 ulUnicodeRange4 = GetUInt( pOS2map + 54 ); + sal_uInt32 ulUnicodeRange4 = GetUInt( pOS2map + 54 ); +#endif // Check for CJK capabilities of the current font - mbHasCJKSupport = (ulUnicodeRange2 & 0x2fff0000) - | (ulUnicodeRange3 & 0x00000001); + mbHasCJKSupport = (ulUnicodeRange2 & 0x2FF00000); mbHasKoreanRange= (ulUnicodeRange1 & 0x10000000) | (ulUnicodeRange2 & 0x01100000); } @@ -1904,9 +1905,12 @@ void ImplReleaseTempFonts( SalData& rSalData ) delete p; } - // notify everybody - if( nCount ) - ::SendMessage( HWND_BROADCAST, WM_FONTCHANGE, 0, NULL ); +#ifndef FR_PRIVATE + // notify every other application + // unless the temp fonts were installed as private fonts + if( nCount > 0 ) + ::PostMessage( HWND_BROADCAST, WM_FONTCHANGE, 0, NULL ); +#endif // FR_PRIVATE } // ----------------------------------------------------------------------- |