diff options
Diffstat (limited to 'vcl/os2/source/gdi/os2layout.cxx')
| -rw-r--r-- | vcl/os2/source/gdi/os2layout.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx index 0d30679bf309..4724c9bb5185 100644 --- a/vcl/os2/source/gdi/os2layout.cxx +++ b/vcl/os2/source/gdi/os2layout.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public: void SetKernData( int, const KERNINGPAIRS* ); int GetKerning( sal_Unicode, sal_Unicode ) const; private: - KERNINGPAIRS* mpKerningPairs; + KERNINGPAIRS* mpKerningPairs; int mnKerningPairs; #endif // GCP_KERN_HACK @@ -111,8 +111,8 @@ public: float GetFontScale() const { return mfFontScale; } protected: - HPS mhPS; // OS2 device handle - FATTRS mhFont; + HPS mhPS; // OS2 device handle + FATTRS mhFont; int mnBaseAdv; // x-offset relative to Layout origin float mfFontScale; // allows metrics emulation of huge font sizes @@ -334,7 +334,7 @@ bool Os2SalLayout::LayoutText( ImplLayoutArgs& rArgs ) nGcpOption |= GCP_USEKERNING; #endif // GCP_KERN_HACK - LONG lLcid = Ft2QueryCharSet( mhPS); + LONG lLcid = Ft2QueryCharSet( mhPS); for( i = 0; i < mnGlyphCount; ++i ) mpOutGlyphs[i] = pBidiStr[ i ]; @@ -570,9 +570,9 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const if( mnGlyphCount <= 0 ) return; - Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) ); - POINTL aPt; - APIRET rc; + Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) ); + POINTL aPt; + APIRET rc; aPt.x = aPos.X(); aPt.y = static_cast<Os2SalGraphics&>(rGraphics).mnHeight - aPos.Y(); @@ -583,13 +583,13 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const // convert to codepage ByteString str( mpOutGlyphs, gsl_getSystemTextEncoding() ); // gliph size is not recalculated, so it could be wrong! - rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS, - &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(), + rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS, + &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(), (LONG*)mpGlyphAdvances, 0); } else { // try unicode rendering to screen - rc = Ft2CharStringPosAtW( static_cast<Os2SalGraphics&>(rGraphics).mhPS, - &aPt, NULL, CHS_VECTOR, mnGlyphCount, (LPWSTR)mpOutGlyphs, + rc = Ft2CharStringPosAtW( static_cast<Os2SalGraphics&>(rGraphics).mhPS, + &aPt, NULL, CHS_VECTOR, mnGlyphCount, (LPWSTR)mpOutGlyphs, (LONG*)mpGlyphAdvances, 0); if (rc == GPI_ERROR) { // if *W fails, convert to codepage and use *A (fallback to GPI into ft2) @@ -598,8 +598,8 @@ void Os2SalLayout::DrawText( SalGraphics& rGraphics ) const debug_printf("Os2SalLayout::DrawText HPS %08x PosAtW failed '%s'!\n",static_cast<Os2SalGraphics&>(rGraphics).mhPS,str.GetBuffer()); #endif // gliph size is not recalculated, so it could be wrong! - rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS, - &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(), + rc = Ft2CharStringPosAtA( static_cast<Os2SalGraphics&>(rGraphics).mhPS, + &aPt, NULL, CHS_VECTOR, mnGlyphCount, (PSZ)str.GetBuffer(), (LONG*)mpGlyphAdvances, 0); } } |