diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/graphite_layout.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/graphite_serverfont.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/sallayout.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/textlayout.hxx | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index 434d6f6dca94..30fe111ead43 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -119,7 +119,7 @@ public: virtual void AdjustLayout( ImplLayoutArgs& ); // adjusting positions // 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 SAL_OVERRIDE; virtual long FillDXArray( sal_Int32* pDXArray ) const; virtual void ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth); diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx index e21590aa9ef4..df205d57129d 100644 --- a/vcl/inc/graphite_serverfont.hxx +++ b/vcl/inc/graphite_serverfont.hxx @@ -68,7 +68,8 @@ public: }; virtual long GetTextWidth() const { return maImpl.GetTextWidth(); } virtual long FillDXArray( sal_Int32* dxa ) const { return maImpl.FillDXArray(dxa); } - virtual int GetTextBreak( long mw, long ce, int f ) const { return maImpl.GetTextBreak(mw, ce, f); } + virtual sal_Int32 GetTextBreak(long mw, long ce, int f) const SAL_OVERRIDE + { return maImpl.GetTextBreak(mw, ce, f); } virtual void GetCaretPositions( int as, sal_Int32* cxa ) const { maImpl.GetCaretPositions(as, cxa); } // used by display layers diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 561c8f9e224d..c4a1d4cdf081 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -263,7 +263,7 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout { public: virtual void DrawText( SalGraphics& ) const; - virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const; + virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; virtual long FillDXArray( sal_Int32* pDXArray ) const; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, @@ -359,7 +359,7 @@ public: // used by upper layers virtual long GetTextWidth() const; virtual long FillDXArray( sal_Int32* pDXArray ) const; - virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const; + virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; // used by display layers diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index d16d2499f9ff..14662c390ed1 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -89,7 +89,7 @@ namespace vcl long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength - ) const; + ) const SAL_OVERRIDE; virtual bool DecomposeTextRectAction() const; private: |