diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-04-15 08:08:23 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-04-15 08:11:30 -0500 |
| commit | 1317fed72bef90eda11b2602557b0210a4a37516 (patch) | |
| tree | b70d342582e3dee2018293b956a1aa21f05a41cb | |
| parent | da7e47c25767ad86484249385daa58b2726a0895 (diff) | |
fix accidental virtual function overload
| -rw-r--r-- | vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx | 10 | ||||
| -rw-r--r-- | vcl/inc/aqua/coretext/salcoretextlayout.hxx | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx index dce1d096c88c..408f2b2ec34e 100644 --- a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx +++ b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx @@ -169,13 +169,14 @@ long CoreTextLayout::FillDXArray( long* pDXArray ) const return width; } -bool CoreTextLayout::GetBoundRect( CGContextRef context, Rectangle& rVCLRect ) const +bool CoreTextLayout::GetBoundRect( SalGraphics& rGraphics, Rectangle& rVCLRect ) const { msgs_debug(layout,"-->"); if ( !m_has_bound_rec ) { - CGRect bound_rect = CTLineGetImageBounds( m_line, context ); + AquaSalGraphics& gr = static_cast<AquaSalGraphics&>(rGraphics); + CGRect bound_rect = CTLineGetImageBounds( m_line, gr.mrContext ); if ( !CGRectIsNull( bound_rect ) ) { m_bound_rect = Rectangle( @@ -300,7 +301,10 @@ long CoreTextLayout::GetTextWidth() const } // not needed. CoreText manage fallback directly -void CoreTextLayout::InitFont() {} +void CoreTextLayout::InitFont() const +{ + msgs_debug(layout,"<-->"); +} bool CoreTextLayout::InitGIA() const { diff --git a/vcl/inc/aqua/coretext/salcoretextlayout.hxx b/vcl/inc/aqua/coretext/salcoretextlayout.hxx index 51a9532d0783..e42752283b9d 100644 --- a/vcl/inc/aqua/coretext/salcoretextlayout.hxx +++ b/vcl/inc/aqua/coretext/salcoretextlayout.hxx @@ -20,14 +20,14 @@ public: virtual void DrawText( SalGraphics& ) const; virtual void DropGlyph( int nStart ); virtual long FillDXArray( long* pDXArray ) const; - virtual bool GetBoundRect( CGContextRef, Rectangle& ) const; + virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const; virtual bool GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int&, sal_Int32* pGlyphAdvances, int* pCharIndexes ) const; virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const; virtual long GetTextWidth() const; - virtual void InitFont(); + virtual void InitFont() const; virtual bool LayoutText( ImplLayoutArgs& ); virtual void MoveGlyph( int nStart, long nNewXPos ); virtual void Simplify( bool bIsBase ); |