[Libreoffice-commits] core.git: 2 commits - vcl/aqua vcl/inc

[Tor Lillqvist]

 vcl/aqua/source/gdi/atsui/salatslayout.cxx      |    3 ++-
 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |    4 ++--
 vcl/inc/coretext/salgdi2.h                      |    1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f26bfa5bdaad8aeb31023884487be422b723c2e6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 29 12:10:20 2013 +0200

    Surely ATSLayout is no friend of the CoreText AquaSalGraphics
    
    Change-Id: I81725b388311ad9aade52906b4c5a6263b6bc104

diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h
index b121f71..19525ae 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi2.h
@@ -143,7 +143,6 @@ private:
 // -------------------
 class AquaSalGraphics : public SalGraphics
 {
-    friend class ATSLayout;
     friend class CTLayout;
 protected:
     AquaSalFrame*                           mpFrame;
commit 784c82384aa83d00cb68ec8c7564180572cc1233
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 29 12:26:53 2013 +0200

    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

diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 311d28d..250831c 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 18509e9..6be3a39 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 )