From 1ee56fc9f446bad5853b121a3c5b137c1d00bbf4 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 29 Nov 2016 10:41:53 +0200 Subject: SalGraphics::GetFontEncodingVector() is a noop now Change-Id: Id706fa242277a0ea7ba44f52eab4a56e404bd2fa Reviewed-on: https://gerrit.libreoffice.org/31372 Tested-by: Jenkins Reviewed-by: Khaled Hosny --- vcl/inc/headless/svpgdi.hxx | 1 - vcl/inc/quartz/salgdi.h | 9 --------- vcl/inc/salgdi.hxx | 12 ------------ vcl/inc/textrender.hxx | 1 - vcl/inc/unx/cairotextrender.hxx | 1 - vcl/inc/unx/genpspgraphics.h | 3 --- vcl/inc/unx/salgdi.h | 2 -- vcl/inc/win/salgdi.h | 9 --------- 8 files changed, 38 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index a5440e23518b..bcd4ac602d9a 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -153,7 +153,6 @@ public: int nGlyphs, FontSubsetInfo& rInfo ) override; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const** ) override; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index f6776b3f2e6f..f752fd2922a9 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -362,15 +362,6 @@ public: FontSubsetInfo& rInfo // out parameter ) override; - // GetFontEncodingVector: a method to get the encoding map Unicode - // to font encoded character; this is only used for type1 fonts and - // may return NULL in case of unknown encoding vector - // if ppNonEncoded is set and non encoded characters (that is type1 - // glyphs with only a name) exist it is set to the corresponding - // map for non encoded glyphs; the encoding vector contains -1 - // as encoding for these cases - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const** ) override; - // GetEmbedFontData: gets the font data for a font marked // embeddable by GetDevFontList or NULL in case of error // parameters: pFont: describes the font in question diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 71a8442f15ea..e7382be11429 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -172,18 +172,6 @@ public: int nGlyphs, FontSubsetInfo& rInfo ) = 0; - // GetFontEncodingVector: a method to get the encoding map Unicode - // to font encoded character; this is only used for type1 fonts and - // may return NULL in case of unknown encoding vector - // if ppNonEncoded is set and non encoded characters (that is type1 - // glyphs with only a name) exist it is set to the corresponding - // map for non encoded glyphs; the encoding vector contains -1 - // as encoding for these cases - virtual const Ucs2SIntMap* GetFontEncodingVector( - const PhysicalFontFace*, - const Ucs2OStrMap** ppNonEncoded, - std::set const** ppPriority) = 0; - // GetEmbedFontData: gets the font data for a font marked // embeddable by GetDevFontList or NULL in case of error // parameters: pFont: describes the font in question diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index 0c01526e3852..694fa7b08458 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -51,7 +51,6 @@ public: int nGlyphs, FontSubsetInfo& rInfo) = 0; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const** ppPriority) = 0; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx index 5c9859f00d97..a8a0d6d58ce0 100644 --- a/vcl/inc/unx/cairotextrender.hxx +++ b/vcl/inc/unx/cairotextrender.hxx @@ -67,7 +67,6 @@ public: int nGlyphs, FontSubsetInfo& rInfo) override; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const**) override; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index 9d2e5302655d..97e759ef5767 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -111,9 +111,6 @@ public: sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) override; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, - const Ucs2OStrMap** ppNonEncoded, - std::set const** ppPriority) override; virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, sal_Int32* pWidths, diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 8d56c8c43208..2a64ebfe0afc 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -131,8 +131,6 @@ public: int nGlyphs, FontSubsetInfo& rInfo ) override; - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const**) override; - virtual const void* GetEmbedFontData( const PhysicalFontFace*, const sal_Ucs* pUnicodes, diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 6dedfe7b0882..a07af12865d0 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -390,15 +390,6 @@ public: FontSubsetInfo& rInfo // out parameter ) override; - // GetFontEncodingVector: a method to get the encoding map Unicode - // to font encoded character; this is only used for type1 fonts and - // may return NULL in case of unknown encoding vector - // if ppNonEncoded is set and non encoded characters (that is type1 - // glyphs with only a name) exist it is set to the corresponding - // map for non encoded glyphs; the encoding vector contains -1 - // as encoding for these cases - virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set const** ) override; - // GetEmbedFontData: gets the font data for a font marked // embeddable by GetDevFontList or NULL in case of error // parameters: pFont: describes the font in question -- cgit