diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-17 18:46:08 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-20 22:10:58 +0200 |
| commit | 2b8528a2745bec7909bfe2265d6110a9964eef47 (patch) | |
| tree | 335279159b6f01de07ea23e15679e566ac000ed5 /vcl/win | |
| parent | 269e960ee190a8f568e99756c90cd98f1a7919ce (diff) | |
Use DeviceCorrdinate for DXArray in FillDXArray and ImplLayoutArgs
Change-Id: Ifba7104a13cf737200c81d1a1bd5ece9a29da60e
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index fe51de257884..d6adc874a514 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -145,7 +145,7 @@ public: sal_Int32* pGlyphAdvances, int* pCharIndexes, const PhysicalFontFace** pFallbackFonts = NULL ) const; - virtual long FillDXArray( long* pDXArray ) const; + virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; @@ -626,7 +626,7 @@ void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const DeleteFont( SelectFont( aHDC, hOrigFont ) ); } -long SimpleWinLayout::FillDXArray( long* pDXArray ) const +DeviceCoordinate SimpleWinLayout::FillDXArray( DeviceCoordinate* pDXArray ) const { if( !mnWidth ) { @@ -966,7 +966,7 @@ public: sal_Int32* pGlyphAdvances, int* pCharPosAry, const PhysicalFontFace** pFallbackFonts = NULL ) const; - virtual long FillDXArray( long* pDXArray ) const; + virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; virtual bool IsKashidaPosValid ( int nCharPos ) const; @@ -2086,7 +2086,7 @@ void UniscribeLayout::DrawText( SalGraphics& ) const DeleteFont( SelectFont( mhDC, hOrigFont ) ); } -long UniscribeLayout::FillDXArray( long* pDXArray ) const +DeviceCoordinate UniscribeLayout::FillDXArray( DeviceCoordinate* pDXArray ) const { // calculate width of the complete layout long nWidth = mnBaseAdv; @@ -2641,7 +2641,7 @@ public: // methods using string indexing virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra=0, int nFactor=1) const SAL_OVERRIDE; - virtual long FillDXArray( long* pDXArray ) const; + virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; @@ -2783,7 +2783,7 @@ sal_Int32 GraphiteWinLayout::GetTextBreak( return nBreak; } -long GraphiteWinLayout::FillDXArray( long* pDXArray ) const +DeviceCoordinate GraphiteWinLayout::FillDXArray( DeviceCoordinate* pDXArray ) const { return maImpl.FillDXArray(pDXArray); } |