Kaydet (Commit) fe93c38a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Use SAL_OVERRIDE consistently in CTLayout

When adding SAL_OVERRIDE to the member functions marked virtual, I
found one that was not an override of anything, and actually not used
at all: GetGlyphOutlines().

Change-Id: I3e56caa6262b2f21f7f47e3851ab0e07bbc4b642
üst a45bdb8a
...@@ -28,25 +28,24 @@ public: ...@@ -28,25 +28,24 @@ public:
explicit CTLayout( const CoreTextStyle* ); explicit CTLayout( const CoreTextStyle* );
virtual ~CTLayout( void ); virtual ~CTLayout( void );
virtual bool LayoutText( ImplLayoutArgs& ); virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
virtual void AdjustLayout( ImplLayoutArgs& ); virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
virtual void DrawText( SalGraphics& ) const; virtual void DrawText( SalGraphics& ) const SAL_OVERRIDE;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& rPos, int&, virtual int GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point& rPos, int&,
sal_Int32* pGlyphAdvances, int* pCharIndexes, sal_Int32* pGlyphAdvances, int* pCharIndexes,
const PhysicalFontFace** pFallbackFonts ) const; const PhysicalFontFace** pFallbackFonts ) const SAL_OVERRIDE;
virtual long GetTextWidth() const; virtual long GetTextWidth() const SAL_OVERRIDE;
virtual long FillDXArray( sal_Int32* pDXArray ) const; virtual long FillDXArray( sal_Int32* pDXArray ) const SAL_OVERRIDE;
virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE;
virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const; virtual void GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray ) const SAL_OVERRIDE;
virtual bool GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const; virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const SAL_OVERRIDE;
virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const;
virtual void InitFont( void) const; virtual void InitFont( void) const SAL_OVERRIDE;
virtual void MoveGlyph( int nStart, long nNewXPos ); virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE;
virtual void DropGlyph( int nStart ); virtual void DropGlyph( int nStart ) SAL_OVERRIDE;
virtual void Simplify( bool bIsBase ); virtual void Simplify( bool bIsBase ) SAL_OVERRIDE;
private: private:
CGPoint GetTextDrawPosition(void) const; CGPoint GetTextDrawPosition(void) const;
...@@ -487,7 +486,6 @@ bool CTLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const ...@@ -487,7 +486,6 @@ bool CTLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const
// glyph fallback is supported directly by Aqua // glyph fallback is supported directly by Aqua
// so methods used only by MultiSalLayout can be dummy implementated // so methods used only by MultiSalLayout can be dummy implementated
bool CTLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; }
void CTLayout::InitFont() const {} void CTLayout::InitFont() const {}
void CTLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {} void CTLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
void CTLayout::DropGlyph( int /*nStart*/ ) {} void CTLayout::DropGlyph( int /*nStart*/ ) {}
......
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