diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
| commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
| tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /vcl/inc/sallayout.hxx | |
| parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) | |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'vcl/inc/sallayout.hxx')
| -rw-r--r-- | vcl/inc/sallayout.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 3a2061b6391c..ae1fe9dda55c 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -175,7 +175,7 @@ public: virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0; virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); } virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0; - virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 + bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 // methods using glyph indexing virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&, @@ -184,7 +184,7 @@ public: virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const; virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const; - virtual bool IsSpacingGlyph( sal_GlyphId ) const; + bool IsSpacingGlyph( sal_GlyphId ) const; // reference counting void Release() const; @@ -193,7 +193,7 @@ public: virtual void MoveGlyph( int nStart, long nNewXPos ) = 0; virtual void DropGlyph( int nStart ) = 0; virtual void Simplify( bool bIsBase ) = 0; - virtual void DisableGlyphInjection( bool /*bDisable*/ ) {} + void DisableGlyphInjection( bool /*bDisable*/ ) {} protected: // used by layout engines @@ -240,7 +240,7 @@ public: // used only by OutputDevice::ImplLayout, TODO: make friend explicit MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont = NULL ); - virtual bool AddFallback( SalLayout& rFallbackLayout, + bool AddFallback( SalLayout& rFallbackLayout, ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont ); virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; @@ -322,8 +322,8 @@ public: void AppendGlyph( const GlyphItem& ); void Reserve(int size) { m_GlyphItems.reserve(size + 1); } virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; - virtual void ApplyDXArray( ImplLayoutArgs& ); - virtual void Justify( DeviceCoordinate nNewWidth ); + void ApplyDXArray( ImplLayoutArgs& ); + void Justify( DeviceCoordinate nNewWidth ); void KashidaJustify( long nIndex, int nWidth ); void ApplyAsianKerning( const sal_Unicode*, int nLength ); void SortGlyphItems(); |