diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-11-29 12:26:53 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-11-29 12:29:43 +0200 |
| commit | 784c82384aa83d00cb68ec8c7564180572cc1233 (patch) | |
| tree | 4c09cbe6d442c002ff4d7c149cf157a39825a250 /vcl/aqua | |
| parent | bf777a24956e8c62d969c2361a200e90eec651c8 (diff) | |
Fix bit-rot in the ATSUI code
But do we want to keep that code still around? I would love to drop
it. Using only CoreText would make some planned refactoring of OS X
and iOS code much simpler.
Change-Id: I9514c254791ea462d528e3e83b4927ac62a9f6ca
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/source/gdi/atsui/salatslayout.cxx | 3 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx index 311d28df9384..250831cea453 100644 --- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx +++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx @@ -48,7 +48,8 @@ public: virtual void DrawText( SalGraphics& ) const; virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int&, - sal_Int32* pGlyphAdvances, int* pCharIndexes ) const; + sal_Int32* pGlyphAdvances, int* pCharIndexes, + const PhysicalFontFace** pFallbackFonts = NULL) const; virtual long GetTextWidth() const; virtual long FillDXArray( sal_Int32* pDXArray ) const; diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx index 18509e97b1e0..6be3a39242f2 100644 --- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx @@ -315,8 +315,8 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF { // even if a family name is not the one we are looking for // it is still useful as a font name alternative - if( rDFA.maMapNames.Len() ) - rDFA.maMapNames += ';'; + if( rDFA.maMapNames.getLength() ) + rDFA.maMapNames += ";"; rDFA.maMapNames += (nBestNameValue < nNameValue) ? rDFA.GetFamilyName() : aUtf16Name; } if( nBestNameValue < nNameValue ) |