[Libreoffice-commits] core.git: vcl/aqua vcl/coretext vcl/generic vcl/headless vcl/inc vcl/unx

Khaled Hosny khaledhosny at eglug.org
Mon Oct 21 00:29:51 PDT 2013


 vcl/aqua/source/gdi/atsui/salgdi.cxx |    7 -------
 vcl/coretext/salgdi2.cxx             |    7 -------
 vcl/generic/print/genpspgraphics.cxx |    5 -----
 vcl/headless/svptext.cxx             |    6 ------
 vcl/inc/aqua/atsui/salgdi.h          |    3 ---
 vcl/inc/coretext/salgdi2.h           |    3 ---
 vcl/inc/generic/genpspgraphics.h     |    1 -
 vcl/inc/headless/svpgdi.hxx          |    1 -
 vcl/inc/salgdi.hxx                   |    4 ----
 vcl/inc/unx/salgdi.h                 |    1 -
 vcl/unx/generic/gdi/salgdi3.cxx      |    8 --------
 11 files changed, 46 deletions(-)

New commits:
commit 8a65399e3d079ce9d4214cbced7840da6f0ab5be
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Oct 16 12:47:02 2013 +0200

    Remove GetKernPairs() with no implementation
    
    I left only the Windows one because it being called (as
    GetKernPairs(0, NULL), but may be it does something, who knows).
    
    Change-Id: Iec05d61c8f0cd311a1158bb1cb07e4ee977f32fe
    Reviewed-on: https://gerrit.libreoffice.org/6260
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 0fc22dc..13fdd50 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -392,13 +392,6 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL
 
 // -----------------------------------------------------------------------
 
-sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
-{
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 static bool AddTempFontDir( const char* pDir )
 {
     FSRef aPathFSRef;
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index caf4b77..c0ae17a 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -341,13 +341,6 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbac
 
 // -----------------------------------------------------------------------
 
-sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
-{
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
 static bool AddTempDevFont(const OUString& rFontFileURL)
 {
     OUString aUSytemPath;
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index d6e6bd6..04b41fe 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -950,11 +950,6 @@ void GenPspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int )
     }
 }
 
-sal_uLong GenPspGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
-{
-    return 0;
-}
-
 sal_Bool GenPspGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index ce90850..0a4bbd1 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -237,12 +237,6 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
 }
 
 
-sal_uLong SvpSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
-{
-    return 0;
-}
-
-
 const ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const
 {
     if( !m_pServerFont[0] )
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index ea404d1..6d6d532 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -261,9 +261,6 @@ public:
     virtual sal_uInt16         SetFont( FontSelectPattern*, int nFallbackLevel );
     // get the current font's metrics
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    // get kernign pairs of the current font
-    // return only PairCount if (pKernPairs == NULL)
-    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     // get the repertoire of the current font
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h
index df66c9d..1c055e9 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi2.h
@@ -317,9 +317,6 @@ public:
     virtual sal_uInt16         SetFont( FontSelectPattern*, int nFallbackLevel );
     // get the current font's metrics
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    // get kernign pairs of the current font
-    // return only PairCount if (pKernPairs == NULL)
-    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     // get the repertoire of the current font
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 07bdb01..636606e 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -90,7 +90,6 @@ public:
     virtual void            SetTextColor( SalColor nSalColor );
     virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual sal_uLong           GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
     virtual void            GetDevFontList( ImplDevFontList* );
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index e2d9b73..13f8b1a 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -132,7 +132,6 @@ public:
     virtual void            SetTextColor( SalColor nSalColor );
     virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual sal_uLong       GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
     virtual void            GetDevFontList( ImplDevFontList* );
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 093e923..442a5a9 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -236,10 +236,6 @@ public:
     // get the current font's metrics
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel = 0 ) = 0;
 
-    // get kerning pairs of the current font
-    // return only PairCount if (pKernPairs == NULL)
-    virtual sal_uLong       GetKernPairs( sal_uLong nMaxPairCount, ImplKernPairData* ) = 0;
-
     // get the repertoire of the current font
     virtual const ImplFontCharMap*
                             GetImplFontCharMap() const = 0;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 583651f..9e3e9a5 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -228,7 +228,6 @@ public:
     virtual void            SetTextColor( SalColor nSalColor );
     virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel );
     virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    virtual sal_uLong           GetKernPairs( sal_uLong nMaxPairs, ImplKernPairData* );
     virtual const ImplFontCharMap* GetImplFontCharMap() const;
     virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
     virtual void            GetDevFontList( ImplDevFontList* );
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 4a5f84f..d6a506971 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -627,14 +627,6 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
 
 // ---------------------------------------------------------------------------
 
-sal_uLong
-X11SalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
-{
-    return 0;
-}
-
-// ---------------------------------------------------------------------------
-
 sal_Bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphIndex, Rectangle& rRect )
 {
     int nLevel = nGlyphIndex >> GF_FONTSHIFT;


More information about the Libreoffice-commits mailing list