From e1261e6ea6e897d38f69c0d250ec34ccf0f6d545 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 5 Oct 2017 07:50:24 +0200 Subject: loplugin:finalclasses in vcl Change-Id: I7de9cd6c5569217aa8d379c6d112cd1874bca8e2 Reviewed-on: https://gerrit.libreoffice.org/43151 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/fontsubset/cff.cxx | 7 ++----- vcl/source/fontsubset/xlat.cxx | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'vcl/source/fontsubset') diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index bd7312457b77..f78d601fcc0a 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -266,7 +266,7 @@ public: static const int NMAXSTACK = 48; // see CFF.appendixB static const int NMAXHINTS = 2*96; // see CFF.appendixB static const int NMAXTRANS = 32; // see CFF.appendixB -public: + explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen); bool initialCffRead(); @@ -274,9 +274,8 @@ public: const sal_GlyphId* pGlyphIds, const U8* pEncoding, GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ); -protected: - int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops); private: + int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops); void convertOneTypeOp(); void convertOneTypeEsc(); void callType2Subr( bool bGlobal, int nSubrNumber); @@ -293,11 +292,9 @@ private: bool mbIgnoreHints; sal_Int32 mnCntrMask; -private: int seekIndexData( int nIndexBase, int nDataIndex); void seekIndexEnd( int nIndexBase); -private: CffLocal maCffLocal[256]; CffLocal* mpCffLocal; diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index 3363b5bd21c5..630720a520b4 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -30,9 +30,8 @@ public: explicit ConverterCache(); ~ConverterCache(); sal_uInt16 convertOne( int nSelect, sal_Unicode ); -protected: - void ensureConverter( int nSelect ); private: + void ensureConverter( int nSelect ); rtl_UnicodeToTextConverter maConverterCache[ MAX_CVT_SELECT+1 ]; rtl_UnicodeToTextContext maContexts[ MAX_CVT_SELECT+1 ]; }; -- cgit