vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx | 10 +++++++---
vcl/inc/aqua/coretext/salcoretextlayout.hxx | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 1317fed72bef90eda11b2602557b0210a4a37516
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun Apr 15 08:08:23 2012 -0500
fix accidental virtual function overload
diff --git a/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx
b/vcl/aqua/source/gdi/coretext/salcoretextlayout.cxx
index dce1d09..408f2b2 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 51a9532..e427522 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 );
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
