diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-03 20:26:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-03 20:30:08 +0100 |
| commit | af43ae6f85f9ca840889d568f15b6123c98037a4 (patch) | |
| tree | 5c96cb61e2f9bd91e941e3474737407def1cf538 /vcl/win | |
| parent | c3760e9099db9cf1be696347e2a0743a3cae1b20 (diff) | |
vcl: try to fix some sal_Int32 GetTextBreak()s
Change-Id: If4aee2b42f0d2e15ca228863754959b7486437ee
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index a0f1ec4660b6..dc6e46947e36 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -158,7 +158,7 @@ public: const PhysicalFontFace** pFallbackFonts = NULL ) const; virtual long FillDXArray( long* pDXArray ) const; - virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const; + virtual salInt32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; // for glyph+font+script fallback @@ -1010,7 +1010,7 @@ public: const PhysicalFontFace** pFallbackFonts = NULL ) const; virtual long FillDXArray( long* pDXArray ) const; - virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const; + virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; virtual bool IsKashidaPosValid ( int nCharPos ) const; @@ -2719,7 +2719,7 @@ public: virtual void DrawText( SalGraphics& ) const; // methods using string indexing - virtual int GetTextBreak( long nMaxWidth, long nCharExtra=0, int nFactor=1 ) const; + virtual sal_Int32 GetTextBreak( long nMaxWidth, long nCharExtra=0, int nFactor=1 ) const; virtual long FillDXArray( long* pDXArray ) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; @@ -2855,9 +2855,10 @@ void GraphiteWinLayout::DrawText(SalGraphics &sal_graphics) const DeleteFont( SelectFont( aHDC, hOrigFont ) ); } -int GraphiteWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const +sal_Int32 GraphiteWinLayout::GetTextBreak( + long nMaxWidth, long nCharExtra, int nFactor) const { - int nBreak = maImpl.GetTextBreak(nMaxWidth, nCharExtra, nFactor); + sal_Int32 nBreak = maImpl.GetTextBreak(nMaxWidth, nCharExtra, nFactor); return nBreak; } |