diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:21:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:21:36 +0000 |
| commit | 1046478f6e63d38e811050f6c3f6c1e538e3d1ec (patch) | |
| tree | dcba3aa1b07533e9a80807dddd23169f5060e932 /vcl/source | |
| parent | f94b9a03bd6ac7c3cd7490287ae39aec17c3d266 (diff) | |
INTEGRATION: CWS gfbfcfg (1.263.34); FILE MERGED
2007/12/03 15:51:27 hdu 1.263.34.5: RESYNC: (1.264-1.266); FILE MERGED
2007/11/27 13:22:58 hdu 1.263.34.4: RESYNC: (1.263-1.264); FILE MERGED
2007/09/12 13:36:20 hdu 1.263.34.3: #i54603# allow compilation on wntmsci
2007/09/07 15:02:23 hdu 1.263.34.2: Start to abstract font fallbacks to cleanup the previous patch
The patch HAD to be applied though it was not close to ready, sorry
When finished font fallback abstraction will solve these regressions
- does not even compile on non-UNX platforms
- introduces UNX-specific dependencies into platform-independent layers
- kills the glyph- and font-fallback features on the non-UNX platforms
- kills the features on UNX platforms that don't have up to date fontconfig lib or matching configuration entries
- causes regressions for non-baseplane unicodes
- kills the japanese EUDC feature
2007/09/05 09:58:34 hdu 1.263.34.1: #i54603# apply Caolan's fontconfig based glyph fallback patch
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/window.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 2c250584b121..bf7889f452b8 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4,9 +4,9 @@ * * $RCSfile: window.cxx,v $ * - * $Revision: 1.268 $ + * $Revision: 1.269 $ * - * last change: $Author: kz $ $Date: 2007-12-12 13:20:34 $ + * last change: $Author: kz $ $Date: 2007-12-12 13:21:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -201,6 +201,7 @@ #endif #include <vcl/pdfextoutdevdata.hxx> +#include <psprint/fontmanager.hxx> #include "vcl/lazydelete.hxx" using namespace rtl; @@ -347,6 +348,12 @@ void Window::ImplInitAppFontData( Window* pWindow ) bool Window::ImplCheckUIFont( const Font& rFont ) { +#ifdef UNX // TODO: use more generic solution + const psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); + if (rMgr.hasFontconfig()) + return true; +#endif + String aTestText; aTestText.Append( Button::GetStandardText( BUTTON_OK ) ); aTestText.Append( Button::GetStandardText( BUTTON_CANCEL ) ); @@ -4270,7 +4277,7 @@ void Window::ImplNewInputContext() else aSize.Height() = (12*pFocusWin->mnDPIY)/72; } - pFontEntry = pFocusWin->mpFontCache->Get( pFocusWin->mpFontList, rFont, aSize, pFocusWin->mpOutDevData ? pFocusWin->mpOutDevData->mpFirstFontSubstEntry : NULL ); + pFontEntry = pFocusWin->mpFontCache->GetFontEntry( pFocusWin->mpFontList, rFont, aSize, pFocusWin->mpOutDevData ? &pFocusWin->mpOutDevData->maDevFontSubst : NULL ); if ( pFontEntry ) aNewContext.mpFont = &pFontEntry->maFontSelData; } |