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

Tor Lillqvist tml at collabora.com
Wed Jan 6 01:10:55 PST 2016


 vcl/inc/win/salgdi.h    |    4 ----
 vcl/win/gdi/salfont.cxx |    3 ---
 2 files changed, 7 deletions(-)

New commits:
commit 3576a87d72dd138d3bb2ce6bbba8df05ca983289
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 6 10:59:38 2016 +0200

    Bin some unused functions and fields
    
    Change-Id: I679bae7734c655afe956845980e885b6b68002cd

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index c58c17a..26b6c2f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -89,11 +89,8 @@ public:
 
     BYTE                    GetCharSet() const          { return meWinCharSet; }
     BYTE                    GetPitchAndFamily() const   { return mnPitchAndFamily; }
-    bool                    SupportsKorean() const      { return mbHasKoreanRange; }
     bool                    SupportsCJK() const         { return mbHasCJKSupport; }
     bool                    SupportsArabic() const      { return mbHasArabicSupport; }
-    bool                    AliasSymbolsHigh() const    { return mbAliasSymbolsHigh; }
-    bool                    AliasSymbolsLow() const     { return mbAliasSymbolsLow; }
 #if ENABLE_GRAPHITE
     bool                    SupportsGraphite() const    { return mbHasGraphiteSupport; }
     const gr_face*          GraphiteFace() const;
@@ -112,7 +109,6 @@ private:
     sal_IntPtr              mnId;
 
     // some members that are initalized lazily when the font gets selected into a HDC
-    mutable bool                    mbHasKoreanRange;
     mutable bool                    mbHasCJKSupport;
 #if ENABLE_GRAPHITE
     mutable GrFontData*             mpGraphiteData;
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 26ade82..e2b4c2e 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -998,7 +998,6 @@ ImplWinFontData::ImplWinFontData( const ImplFontAttributes& rDFS,
     int nHeight, BYTE eWinCharSet, BYTE nPitchAndFamily )
 :   PhysicalFontFace( rDFS ),
     mnId( 0 ),
-    mbHasKoreanRange( false ),
     mbHasCJKSupport( false ),
 #if ENABLE_GRAPHITE
     mpGraphiteData(NULL),
@@ -1244,8 +1243,6 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const
             sal_uInt32 ulUnicodeRange2 = GetUInt( pTable + 46 );
 
             mbHasCJKSupport = (ulUnicodeRange2 & 0x2DF00000);
-            mbHasKoreanRange= (ulUnicodeRange1 & 0x10000000)
-                            | (ulUnicodeRange2 & 0x01100000);
             mbHasArabicSupport = (ulUnicodeRange1 & 0x00002000);
         }
     }


More information about the Libreoffice-commits mailing list