diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-01 10:21:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-01 10:21:05 +0100 |
| commit | 2844b43a3900595a6a8a759fbdd7d8d485078e79 (patch) | |
| tree | 9f13afb9744d47a4321806670564e78eac2ed306 /vcl | |
| parent | 69d7c26bd1a7c00586c2fba49d831230d63aa990 (diff) | |
#i112247# Fix this up for os2 as well
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/os2/inc/salgdi.h | 2 | ||||
| -rw-r--r-- | vcl/os2/source/gdi/salgdi3.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h index cf05ff15d7e2..2fc98147bfc8 100644 --- a/vcl/os2/inc/salgdi.h +++ b/vcl/os2/inc/salgdi.h @@ -252,7 +252,7 @@ public: // set the font virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); // get the current font's etrics - virtual void GetFontMetric( ImplFontMetricData* ); + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx index e25e68ee5a4c..2086c2a5e4d3 100644 --- a/vcl/os2/source/gdi/salgdi3.cxx +++ b/vcl/os2/source/gdi/salgdi3.cxx @@ -854,7 +854,7 @@ USHORT Os2SalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel ) // ----------------------------------------------------------------------- -void Os2SalGraphics::GetFontMetric( ImplFontMetricData* pMetric ) +void Os2SalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel ) { FONTMETRICS aOS2Metric; Ft2QueryFontMetrics( mhPS, sizeof( aOS2Metric ), &aOS2Metric ); @@ -915,7 +915,7 @@ void Os2SalGraphics::GetFontMetric( ImplFontMetricData* pMetric ) // #107888# improved metric compatibility for Asian fonts... // TODO: assess workaround below for CWS >= extleading // TODO: evaluate use of aWinMetric.sTypo* members for CJK - if( mpOs2FontData[0] && mpOs2FontData[0]->SupportsCJK() ) + if( mpOs2FontData[nFallbackLevel] && mpOs2FontData[nFallbackLevel]->SupportsCJK() ) { pMetric->mnIntLeading += pMetric->mnExtLeading; |