From b0229855057ed4d73e73ecd8c501a4564f2237ce Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 9 Jan 2017 09:22:34 +0200 Subject: loplugin:unusedfields Change-Id: I9611511cb3480734dea3c3cbaf0d659071366ad1 Reviewed-on: https://gerrit.libreoffice.org/32873 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- vcl/inc/unx/fontmanager.hxx | 1 - vcl/inc/unx/glyphcache.hxx | 6 +----- vcl/source/gdi/pdfwriter_impl.hxx | 12 ------------ vcl/unx/generic/fontmanager/fontmanager.cxx | 1 - vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 1 - 5 files changed, 1 insertion(+), 20 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index bf5e7b0d133f..dc714f80a982 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -142,7 +142,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager int m_nYMin; int m_nXMax; int m_nYMax; - bool m_bUserOverride; int m_nDirectory; // atom containing system dependent path OString m_aFontFile; // relative to directory diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 935837d2a8a7..4e31a7189744 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -176,8 +176,7 @@ private: int mnWidth; int mnPrioEmbedded; int mnPrioAntiAlias; - int mnPrioAutoHint; - FreetypeFontInfo* mpFontInfo; + FreetypeFontInfo* mpFontInfo; FT_Int mnLoadFlags; double mfStretch; FT_FaceRec_* maFaceFT; @@ -190,9 +189,6 @@ private: bool mbArtBold; bool mbUseGamma; - typedef std::unordered_map GlyphSubstitution; - GlyphSubstitution maGlyphSubstitution; - hb_font_t* mpHbFont; }; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b50dc4da26d7..e6c28558f742 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -335,21 +335,9 @@ public: FontMapping m_aMapping; }; typedef std::map< const PhysicalFontFace*, FontSubset > FontSubsetData; - struct EmbedCode - { - sal_Ucs m_aUnicode; - OString m_aName; - }; - struct EmbedEncoding - { - sal_Int32 m_nFontID; - std::vector< EmbedCode > m_aEncVector; - std::map< sal_Ucs, sal_Int8 > m_aCMap; - }; struct EmbedFont { sal_Int32 m_nNormalFontID; - std::list< EmbedEncoding > m_aExtendedEncodings; EmbedFont() : m_nNormalFontID( 0 ) {} }; diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index bff7e4e40628..4e7a22c88557 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -106,7 +106,6 @@ PrintFontManager::PrintFont::PrintFont() , m_nYMin(0) , m_nXMax(0) , m_nYMax(0) -, m_bUserOverride( false ) , m_nDirectory(0) , m_nCollectionEntry(0) , m_nTypeFlags(TYPEFLAG_INVALID) diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 50c5ebab77a1..62956369587b 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -375,7 +375,6 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI mnSin( 0 ), mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias), - mnPrioAutoHint(nDefaultPrioAutoHint), mpFontInfo( pFI ), mnLoadFlags( 0 ), maFaceFT( nullptr ), -- cgit