diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:21:43 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:21:43 +0000 |
commit | fe975d9590358bf4b8ae57d8e962d8c7faa525ac (patch) | |
tree | bde15383cac34913a0360785fcbaecb47d98770b /vcl/source/glyphs | |
parent | bef25f403016dd7d545a2f621cfb5681d1cb4103 (diff) |
INTEGRATION: CWS ooo64bit01 (1.14.20); FILE MERGED
2004/04/13 03:42:30 fa 1.14.20.3: #i8605# Make vcl 64-bit clean, all coordinate arrays (like pDXAry, etc) should be
sal_Int32* rather than long*
2004/03/31 16:49:23 fa 1.14.20.2: Back out of changes since 2004-03-24, focus on smaller, more integratable changes
2004/03/29 00:30:31 fa 1.14.20.1: More 64-bit changes. 'rsc' still broken, but not as much as before.
Diffstat (limited to 'vcl/source/glyphs')
-rw-r--r-- | vcl/source/glyphs/gcach_vdev.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx index 3ec37068d3f8..9e77f23faa94 100644 --- a/vcl/source/glyphs/gcach_vdev.cxx +++ b/vcl/source/glyphs/gcach_vdev.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gcach_vdev.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2004-02-26 13:15:31 $ + * last change: $Author: rt $ $Date: 2004-06-17 12:21:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -197,7 +197,7 @@ void VirtDevServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const vdev.SetFont( aFont ); // get glyph metrics - long nCharWidth = 10; + sal_Int32 nCharWidth = 10; // TODO: vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth ); rGD.SetCharWidth( nCharWidth ); |