diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-31 12:24:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-31 12:24:55 +0000 |
| commit | ff4663132137fbf985cb8856faa158959ac85db9 (patch) | |
| tree | 05abf47bd5049642d52e6195232aa038ca09b7cc /vcl | |
| parent | 59374407f713d19d62f51d4fdd5ccce99720c459 (diff) | |
INTEGRATION: CWS pdffix02 (1.234.38); FILE MERGED
2008/03/31 08:29:22 hdu 1.234.38.4: RESYNC: (1.236-1.237); FILE MERGED
2008/03/10 12:58:15 hdu 1.234.38.3: #i85554# ImplFontData const-correctness fixes
2008/02/18 15:28:10 hdu 1.234.38.2: RESYNC: (1.234-1.236); FILE MERGED
2008/01/17 16:28:46 hdu 1.234.38.1: #i83121# adjust to recent sallayout.hxx changes
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 7ea63c3e19da..e3b61308b311 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outdev3.cxx,v $ * - * $Revision: 1.237 $ + * $Revision: 1.238 $ * - * last change: $Author: kz $ $Date: 2008-03-05 17:09:15 $ + * last change: $Author: kz $ $Date: 2008-03-31 13:24:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2799,7 +2799,7 @@ ImplFontSelectData::ImplFontSelectData( const Font& rFont, // ----------------------------------------------------------------------- -ImplFontSelectData::ImplFontSelectData( ImplFontData& rFontData, +ImplFontSelectData::ImplFontSelectData( const ImplFontData& rFontData, const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) : ImplFontAttributes( rFontData ), mnWidth( rSize.Width() ), @@ -2818,7 +2818,7 @@ ImplFontSelectData::ImplFontSelectData( ImplFontData& rFontData, // ======================================================================= -size_t ImplFontCache::IFSD_Hash::operator()(const ImplFontSelectData& rFSD ) const +size_t ImplFontCache::IFSD_Hash::operator()( const ImplFontSelectData& rFSD ) const { // TODO: does it pay off to improve this hash function? static FontNameHash aFontNameHash; @@ -4596,7 +4596,7 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, sal_Int32 nWidth = 0, nAdvance=0; for( int nStart = 0;;) { - sal_Int32 nGlyphIndex; + sal_GlyphId nGlyphIndex; if( !rSalLayout.GetNextGlyphs( 1, &nGlyphIndex, aPos, nStart, &nAdvance ) ) break; @@ -4910,7 +4910,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) Rectangle aRectangle; for( int nStart = 0;;) { - sal_Int32 nGlyphIndex; + sal_GlyphId nGlyphIndex; if( !rSalLayout.GetNextGlyphs( 1, &nGlyphIndex, aOutPoint, nStart ) ) break; |