Kaydet (Commit) af43ae6f authored tarafından Michael Stahl's avatar Michael Stahl

vcl: try to fix some sal_Int32 GetTextBreak()s

Change-Id: If4aee2b42f0d2e15ca228863754959b7486437ee
üst c3760e90
...@@ -205,7 +205,7 @@ public: ...@@ -205,7 +205,7 @@ public:
int GetOrientation() const { return mnOrientation; } int GetOrientation() const { return mnOrientation; }
// methods using string indexing // methods using string indexing
virtual int GetTextBreak( long nMaxWidth, long nCharExtra=0, int nFactor=1 ) const = 0; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra=0, int nFactor=1) const = 0;
virtual long FillDXArray( sal_Int32* pDXArray ) const = 0; virtual long FillDXArray( sal_Int32* pDXArray ) const = 0;
virtual long GetTextWidth() const { return FillDXArray( NULL ); } virtual long GetTextWidth() const { return FillDXArray( NULL ); }
virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const = 0; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const = 0;
...@@ -263,7 +263,7 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout ...@@ -263,7 +263,7 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
{ {
public: public:
virtual void DrawText( SalGraphics& ) const; virtual void DrawText( SalGraphics& ) const;
virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const;
virtual long FillDXArray( sal_Int32* pDXArray ) const; virtual long FillDXArray( sal_Int32* pDXArray ) const;
virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos,
...@@ -359,7 +359,7 @@ public: ...@@ -359,7 +359,7 @@ public:
// used by upper layers // used by upper layers
virtual long GetTextWidth() const; virtual long GetTextWidth() const;
virtual long FillDXArray( sal_Int32* pDXArray ) const; virtual long FillDXArray( sal_Int32* 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, sal_Int32* pCaretXArray ) const; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const;
// used by display layers // used by display layers
......
...@@ -158,7 +158,7 @@ public: ...@@ -158,7 +158,7 @@ public:
const PhysicalFontFace** pFallbackFonts = NULL ) const; const PhysicalFontFace** pFallbackFonts = NULL ) const;
virtual long FillDXArray( long* pDXArray ) 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; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const;
// for glyph+font+script fallback // for glyph+font+script fallback
...@@ -1010,7 +1010,7 @@ public: ...@@ -1010,7 +1010,7 @@ public:
const PhysicalFontFace** pFallbackFonts = NULL ) const; const PhysicalFontFace** pFallbackFonts = NULL ) const;
virtual long FillDXArray( long* pDXArray ) 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 void GetCaretPositions( int nArraySize, long* pCaretXArray ) const;
virtual bool IsKashidaPosValid ( int nCharPos ) const; virtual bool IsKashidaPosValid ( int nCharPos ) const;
...@@ -2719,7 +2719,7 @@ public: ...@@ -2719,7 +2719,7 @@ public:
virtual void DrawText( SalGraphics& ) const; virtual void DrawText( SalGraphics& ) const;
// methods using string indexing // 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 long FillDXArray( long* pDXArray ) const;
virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const;
...@@ -2855,9 +2855,10 @@ void GraphiteWinLayout::DrawText(SalGraphics &sal_graphics) const ...@@ -2855,9 +2855,10 @@ void GraphiteWinLayout::DrawText(SalGraphics &sal_graphics) const
DeleteFont( SelectFont( aHDC, hOrigFont ) ); 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; return nBreak;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment