summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-27 11:12:45 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-27 11:12:45 +0000
commitbad84beacb186b3d356ea12bf132fb15a5b3701e (patch)
tree4c4383c7510bac8f5a36e681a1e5c5fa8ee24f3f
parentcef7c77f3aeb4546b1ce95eb1e90ae4f293d33a5 (diff)
INTEGRATION: CWS vcl93 (1.114.60); FILE MERGED
2008/08/19 15:17:37 hdu 1.114.60.1: #i92648# fix PDF export of vertically substituted glyphs
-rwxr-xr-xvcl/win/source/gdi/winlayout.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index ac3fc664359c..36cb76800eac 100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: winlayout.cxx,v $
- * $Revision: 1.114 $
+ * $Revision: 1.115 $
*
* This file is part of OpenOffice.org.
*
@@ -585,21 +585,19 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
while( nCount < nLen )
{
// update return values {nGlyphIndex,nCharPos,nGlyphAdvance}
- long nGlyphIndex = mpOutGlyphs[ nStart ];
+ sal_GlyphId nGlyphIndex = mpOutGlyphs[ nStart ];
if( mbDisableGlyphs )
{
if( mnLayoutFlags & SAL_LAYOUT_VERTICAL )
{
-#ifdef GNG_VERT_HACK
- sal_UCS4 cChar = (sal_UCS4)(nGlyphIndex & GF_IDXMASK);
+ const sal_UCS4 cChar = static_cast<sal_UCS4>(nGlyphIndex & GF_IDXMASK);
if( mrWinFontData.HasGSUBstitutions( mhDC )
&& mrWinFontData.IsGSUBstituted( cChar ) )
- nGlyphIndex |= GF_ROTL | GF_GSUB;
+ nGlyphIndex |= GF_GSUB | GF_ROTL;
else
-#endif // GNG_VERT_HACK
{
nGlyphIndex |= GetVerticalFlags( cChar );
- if( !(nGlyphIndex & GF_ROTMASK) )
+ if( (nGlyphIndex & GF_ROTMASK) == 0 )
nGlyphIndex |= GF_VERT;
}
}