summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/aqua/source/gdi/atsui/salatslayout.cxx2
-rw-r--r--vcl/coretext/ctlayout.cxx2
-rw-r--r--vcl/inc/graphite_layout.hxx2
-rw-r--r--vcl/inc/graphite_serverfont.hxx3
-rw-r--r--vcl/inc/sallayout.hxx4
-rw-r--r--vcl/inc/textlayout.hxx2
-rw-r--r--vcl/source/gdi/textlayout.cxx2
-rw-r--r--vcl/win/source/gdi/winlayout.cxx6
8 files changed, 12 insertions, 11 deletions
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 801af6a55801..59826e96a61f 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -53,7 +53,7 @@ public:
virtual long GetTextWidth() 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 SAL_OVERRIDE;
virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const;
virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const;
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index b6d2c1665f27..56d86967aa53 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -38,7 +38,7 @@ public:
virtual long GetTextWidth() 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 SAL_OVERRIDE;
virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const;
virtual bool GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const;
virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const;
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:
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 5e7529900683..7d336b511390 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -80,7 +80,7 @@ namespace vcl
virtual long GetTextWidth( const OUString& rStr, sal_Int32 nIndex, sal_Int32 nLen ) const;
virtual void DrawText( const Point& _rStartPoint, const OUString& _rText, sal_Int32 _nStartIndex, sal_Int32 _nLength, MetricVector* _pVector, OUString* _pDisplayText );
virtual bool GetCaretPositions( const OUString& _rText, sal_Int32* _pCaretXArray, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
- virtual sal_Int32 GetTextBreak( const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength ) const;
+ virtual sal_Int32 GetTextBreak(const OUString& _rText, long _nMaxTextWidth, sal_Int32 _nStartIndex, sal_Int32 _nLength) const SAL_OVERRIDE;
virtual bool DecomposeTextRectAction() const;
public:
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index dc6e46947e36..d06a0600460c 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 salInt32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const;
+ virtual salInt32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE;
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 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, long* pCaretXArray ) const;
virtual bool IsKashidaPosValid ( int nCharPos ) const;
@@ -2719,7 +2719,7 @@ public:
virtual void DrawText( SalGraphics& ) const;
// methods using string indexing
- virtual sal_Int32 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( long* pDXArray ) const;
virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const;
generated by cgit (git 2.34.1) at 2024-07-12 21:06:23 +0000