diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-05 07:50:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-05 09:48:43 +0200 |
commit | e1261e6ea6e897d38f69c0d250ec34ccf0f6d545 (patch) | |
tree | f6fea1de114f6e81d8e61014a7b366ddedc67b16 /vcl | |
parent | e5d943d984bb0918f971eec45f45384cc0c72b67 (diff) |
loplugin:finalclasses in vcl
Change-Id: I7de9cd6c5569217aa8d379c6d112cd1874bca8e2
Reviewed-on: https://gerrit.libreoffice.org/43151
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/headless/svpcairotextrender.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/opengl/program.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/sallayout.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/unx/genpspgraphics.h | 1 | ||||
-rw-r--r-- | vcl/inc/unx/pixmap.hxx | 2 | ||||
-rw-r--r-- | vcl/source/edit/textdoc.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 | ||||
-rw-r--r-- | vcl/source/fontsubset/cff.cxx | 7 | ||||
-rw-r--r-- | vcl/source/fontsubset/xlat.cxx | 3 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_clipboard.hxx | 2 | ||||
-rw-r--r-- | vcl/workben/icontest.cxx | 3 | ||||
-rw-r--r-- | vcl/workben/mtfdemo.cxx | 2 |
12 files changed, 7 insertions, 25 deletions
diff --git a/vcl/inc/headless/svpcairotextrender.hxx b/vcl/inc/headless/svpcairotextrender.hxx index dbd69b399732..bb258512a7c2 100644 --- a/vcl/inc/headless/svpcairotextrender.hxx +++ b/vcl/inc/headless/svpcairotextrender.hxx @@ -16,7 +16,6 @@ class SvpSalGraphics; class SvpCairoTextRender : public CairoTextRender { -protected: SvpSalGraphics& mrParent; public: diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 88ec1b7c1896..da2be164866f 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -112,7 +112,7 @@ public: GLenum eType, GLboolean bNormalized, GLsizei aStride, const GLvoid* pPointer); -protected: +private: GLuint GetUniformLocation( const OString& rName ); }; diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 4fd0e4c25317..b64de3ffed69 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -89,7 +89,6 @@ public: ImplLayoutRuns maRuns; ImplLayoutRuns maFallbackRuns; -public: ImplLayoutArgs( const OUString& rStr, int nMinCharPos, int nEndCharPos, SalLayoutFlags nFlags, const LanguageTag& rLanguageTag, @@ -111,7 +110,7 @@ public: { return !maFallbackRuns.IsEmpty(); } bool PrepareFallback(); -protected: +private: void AddRun( int nMinCharPos, int nEndCharPos, bool bRTL ); }; diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index c3e7c35cc350..49682011954b 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -41,7 +41,6 @@ class ImplFontMetricData; class VCL_DLLPUBLIC GenPspGraphics : public SalGraphics { - protected: psp::JobData* m_pJobData; psp::PrinterGfx* m_pPrinterGfx; diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx index 658935a70e4d..81144a2cda10 100644 --- a/vcl/inc/unx/pixmap.hxx +++ b/vcl/inc/unx/pixmap.hxx @@ -35,7 +35,7 @@ public: int GetWidth() const { return mnWidth; }; int GetHeight() const { return mnHeight; }; -protected: +private: int mnWidth; int mnHeight; }; diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index 5a6fd869b040..61839aae9936 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -65,11 +65,9 @@ public: class TextNode { -private: OUString maText; TextCharAttribList maCharAttribs; -protected: void ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNewChars ); void CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDelChars ); @@ -95,11 +93,9 @@ public: class TextDoc { -private: std::vector<TextNode*> maTextNodes; sal_uInt16 mnLeftMargin; -protected: void DestroyTextNodes(); public: diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index f040a6489676..44f0bc6c2f27 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -88,8 +88,6 @@ static ::osl::Mutex& getListMutex() class ImpFilterOutputStream : public ::cppu::WeakImplHelper< css::io::XOutputStream > { -protected: - SvStream& mrStm; virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) override 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 ]; }; diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 8c7773fd02e2..45c8c35b0353 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -47,8 +47,6 @@ namespace x11 { X11Clipboard( SelectionManager& rManager, Atom aSelection ); - protected: - friend class SelectionManager; void fireChangedContentsEvent(); diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 216ab9e4b890..08524157f906 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -60,9 +60,6 @@ namespace { class MyWorkWindow : public WorkWindow { -private: - -protected: double mnStartTime; int mnPaintCount; diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index 6effbadcc473..a9f52da4397a 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -104,7 +104,7 @@ public: return 0; } -protected: +private: uno::Reference<lang::XMultiServiceFactory> xMSF; void Init() override { |