From 911f3a122a6adc36ac25940b29627b26405e2379 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 26 Jan 2015 21:22:26 +0000 Subject: these are const inputs, we fill widths from pGlyphIds via pEncoding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I32d8bbc5083223b540f76a928de505d611627957 Reviewed-on: https://gerrit.libreoffice.org/14196 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/inc/cairotextrender.hxx | 4 ++-- vcl/inc/fontmanager.hxx | 4 ++-- vcl/inc/generic/genpspgraphics.h | 4 ++-- vcl/inc/headless/svpgdi.hxx | 4 ++-- vcl/inc/quartz/salgdi.h | 4 ++-- vcl/inc/salgdi.hxx | 4 ++-- vcl/inc/textrender.hxx | 4 ++-- vcl/inc/unx/salgdi.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx index 87eede066651..e47b7b3f9982 100644 --- a/vcl/inc/cairotextrender.hxx +++ b/vcl/inc/cairotextrender.hxx @@ -103,8 +103,8 @@ public: virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, - sal_GlyphId* pGlyphIDs, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIDs, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo) SAL_OVERRIDE; diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index 1de2e70fcfb6..2cf6e6ad713a 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -481,8 +481,8 @@ public: bool createFontSubset( FontSubsetInfo&, fontID nFont, const OUString& rOutFile, - sal_GlyphId* pGlyphIDs, - sal_uInt8* pNewEncoding, + const sal_GlyphId* pGlyphIDs, + const sal_uInt8* pNewEncoding, sal_Int32* pWidths, int nGlyphs, bool bVertical = false diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 27e4a62c05e5..2982c8328228 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -102,8 +102,8 @@ public: virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, - sal_GlyphId* pGlyphIDs, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIDs, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) SAL_OVERRIDE; diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 46081402a10e..d429b80e7e82 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -121,8 +121,8 @@ public: virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, - sal_GlyphId* pGlyphIds, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIds, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index eb55e9655ea4..737f8d453f41 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -367,8 +367,8 @@ public: // as "undefined character" virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, - sal_GlyphId* pGlyphIds, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIds, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo // out parameter diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 6e5e80079296..114a5c214784 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -174,8 +174,8 @@ public: virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, - sal_GlyphId* pGlyphIDs, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIDs, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) = 0; diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index 60925bbfb67e..a3a8876a4f67 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -53,8 +53,8 @@ public: virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, - sal_GlyphId* pGlyphIDs, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIDs, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo) = 0; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 97a5ac2371da..baa7de7c4286 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -126,8 +126,8 @@ public: virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, - sal_GlyphId* pGlyphIDs, - sal_uInt8* pEncoding, + const sal_GlyphId* pGlyphIDs, + const sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) SAL_OVERRIDE; -- cgit