basic/inc/sbstdobj.hxx | 2 - chart2/inc/ChartModel.hxx | 2 - chart2/inc/ChartView.hxx | 2 - desktop/inc/app.hxx | 2 - desktop/inc/lib/init.hxx | 2 - editeng/inc/editattr.hxx | 48 +++++++++++++++++++++++----------------------- editeng/inc/editdoc.hxx | 4 +-- editeng/inc/edtspell.hxx | 3 -- editeng/inc/unomodel.hxx | 2 - emfio/inc/mtftools.hxx | 6 ++--- 10 files changed, 36 insertions(+), 37 deletions(-)
New commits: commit 4e0a6e43f48ef2d39433bdd8af3b6fd1906e2940 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Jan 14 10:22:10 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Jan 14 13:25:07 2020 +0100 loplugin:finalclasses in basic..emfio Change-Id: I1b0df1a6cb5b8db9db09cb1d55d932459ab16d81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86741 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 456c6809a07a..965940c8ddcd 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -25,7 +25,7 @@ #include <basic/sbxfac.hxx> #include <basic/basicdllapi.h> -class SbStdFactory : public SbxFactory +class SbStdFactory final : public SbxFactory { public: SbStdFactory(); diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 969e29435862..fe9cc2c7fe89 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -105,7 +105,7 @@ typedef cppu::WeakImplHelper< class UndoManager; class ChartView; -class OOO_DLLPUBLIC_CHARTTOOLS ChartModel : public impl::ChartModel_Base +class OOO_DLLPUBLIC_CHARTTOOLS ChartModel final : public impl::ChartModel_Base { private: diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 7993743919fd..266ff6b6a8f9 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -78,7 +78,7 @@ struct TimeBasedInfo * The View is not responsible to handle single user events (that is instead * done by the ChartWindow). */ -class ChartView : public ::cppu::WeakImplHelper< +class ChartView final : public ::cppu::WeakImplHelper< css::lang::XInitialization ,css::lang::XServiceInfo ,css::datatransfer::XTransferable diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 2fc67ab92c14..04b5a57cdae3 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -47,7 +47,7 @@ namespace desktop class CommandLineArgs; class Lockfile; struct ConvertData; -class Desktop : public Application +class Desktop final : public Application { int doShutdown(); diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index befb378f430d..420b0d481583 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -70,7 +70,7 @@ namespace desktop { static RectangleAndPart Create(const std::string& rPayload); }; - class DESKTOP_DLLPUBLIC CallbackFlushHandler : public Idle + class DESKTOP_DLLPUBLIC CallbackFlushHandler final : public Idle { public: explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument, LibreOfficeKitCallback pCallback, void* pData); diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx index 80f6ce156e62..7c9215d22544 100644 --- a/editeng/inc/editattr.hxx +++ b/editeng/inc/editattr.hxx @@ -151,7 +151,7 @@ inline void EditCharAttrib::Collaps( sal_Int32 nDiff ) -class EditCharAttribFont: public EditCharAttrib +class EditCharAttribFont final : public EditCharAttrib { public: EditCharAttribFont( const SvxFontItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -161,7 +161,7 @@ public: -class EditCharAttribWeight : public EditCharAttrib +class EditCharAttribWeight final : public EditCharAttrib { public: EditCharAttribWeight( const SvxWeightItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -170,7 +170,7 @@ public: }; -class EditCharAttribItalic : public EditCharAttrib +class EditCharAttribItalic final : public EditCharAttrib { public: EditCharAttribItalic( const SvxPostureItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -180,7 +180,7 @@ public: -class EditCharAttribShadow : public EditCharAttrib +class EditCharAttribShadow final : public EditCharAttrib { public: EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -190,7 +190,7 @@ public: -class EditCharAttribEscapement : public EditCharAttrib +class EditCharAttribEscapement final : public EditCharAttrib { public: EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -200,7 +200,7 @@ public: -class EditCharAttribOutline : public EditCharAttrib +class EditCharAttribOutline final : public EditCharAttrib { public: EditCharAttribOutline( const SvxContourItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -210,7 +210,7 @@ public: -class EditCharAttribStrikeout : public EditCharAttrib +class EditCharAttribStrikeout final : public EditCharAttrib { public: EditCharAttribStrikeout( const SvxCrossedOutItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -220,7 +220,7 @@ public: -class EditCharAttribCaseMap : public EditCharAttrib +class EditCharAttribCaseMap final : public EditCharAttrib { public: EditCharAttribCaseMap( const SvxCaseMapItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -230,7 +230,7 @@ public: -class EditCharAttribUnderline : public EditCharAttrib +class EditCharAttribUnderline final : public EditCharAttrib { public: EditCharAttribUnderline( const SvxUnderlineItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -240,7 +240,7 @@ public: -class EditCharAttribOverline : public EditCharAttrib +class EditCharAttribOverline final : public EditCharAttrib { public: EditCharAttribOverline( const SvxOverlineItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -250,7 +250,7 @@ public: -class EditCharAttribEmphasisMark : public EditCharAttrib +class EditCharAttribEmphasisMark final : public EditCharAttrib { public: EditCharAttribEmphasisMark( const SvxEmphasisMarkItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -260,7 +260,7 @@ public: -class EditCharAttribRelief : public EditCharAttrib +class EditCharAttribRelief final : public EditCharAttrib { public: EditCharAttribRelief( const SvxCharReliefItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -270,7 +270,7 @@ public: -class EditCharAttribFontHeight : public EditCharAttrib +class EditCharAttribFontHeight final : public EditCharAttrib { public: EditCharAttribFontHeight( const SvxFontHeightItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -280,7 +280,7 @@ public: -class EditCharAttribFontWidth : public EditCharAttrib +class EditCharAttribFontWidth final : public EditCharAttrib { public: EditCharAttribFontWidth( const SvxCharScaleWidthItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -290,7 +290,7 @@ public: -class EditCharAttribColor : public EditCharAttrib +class EditCharAttribColor final : public EditCharAttrib { public: EditCharAttribColor( const SvxColorItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -299,7 +299,7 @@ public: }; -class EditCharAttribBackgroundColor : public EditCharAttrib +class EditCharAttribBackgroundColor final : public EditCharAttrib { public: EditCharAttribBackgroundColor(const SvxBackgroundColorItem& rAttr, @@ -310,7 +310,7 @@ public: -class EditCharAttribLanguage : public EditCharAttrib +class EditCharAttribLanguage final : public EditCharAttrib { public: EditCharAttribLanguage( const SvxLanguageItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -320,7 +320,7 @@ public: -class EditCharAttribTab : public EditCharAttrib +class EditCharAttribTab final : public EditCharAttrib { public: EditCharAttribTab( const SfxVoidItem& rAttr, sal_Int32 nPos ); @@ -330,7 +330,7 @@ public: -class EditCharAttribLineBreak : public EditCharAttrib +class EditCharAttribLineBreak final : public EditCharAttrib { public: EditCharAttribLineBreak( const SfxVoidItem& rAttr, sal_Int32 nPos ); @@ -340,7 +340,7 @@ public: -class EditCharAttribField: public EditCharAttrib +class EditCharAttribField final : public EditCharAttrib { OUString aFieldValue; o3tl::optional<Color> mxTxtColor; @@ -369,7 +369,7 @@ public: -class EditCharAttribPairKerning : public EditCharAttrib +class EditCharAttribPairKerning final : public EditCharAttrib { public: EditCharAttribPairKerning( const SvxAutoKernItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -379,7 +379,7 @@ public: -class EditCharAttribKerning : public EditCharAttrib +class EditCharAttribKerning final : public EditCharAttrib { public: EditCharAttribKerning( const SvxKerningItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -389,7 +389,7 @@ public: -class EditCharAttribWordLineMode: public EditCharAttrib +class EditCharAttribWordLineMode final : public EditCharAttrib { public: EditCharAttribWordLineMode( const SvxWordLineModeItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); @@ -398,7 +398,7 @@ public: }; -class EditCharAttribGrabBag: public EditCharAttrib +class EditCharAttribGrabBag final : public EditCharAttrib { public: EditCharAttribGrabBag( const SfxGrabBagItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 2c0d54f93454..454f764bbb48 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -816,13 +816,13 @@ inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, sal_Int3 void CheckOrderedList(const CharAttribList::AttribsType& rAttribs); #endif -class EditEngineItemPool : public SfxItemPool +class EditEngineItemPool final : public SfxItemPool { private: std::shared_ptr<DefItems> m_xDefItems; public: EditEngineItemPool(); -protected: +private: virtual ~EditEngineItemPool() override; }; diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx index 0454c7bbe98c..2c90f39374b1 100644 --- a/editeng/inc/edtspell.hxx +++ b/editeng/inc/edtspell.hxx @@ -34,13 +34,12 @@ class EditView; class EditEngine; class ContentNode; -class EditSpellWrapper : public SvxSpellWrapper +class EditSpellWrapper final : public SvxSpellWrapper { private: EditView* pEditView; void CheckSpellTo(); -protected: virtual void SpellStart( SvxSpellArea eArea ) override; virtual void SpellContinue() override; // Check area virtual void ReplaceAll( const OUString &rNewText ) override; diff --git a/editeng/inc/unomodel.hxx b/editeng/inc/unomodel.hxx index a3af44cf4e3a..29e8fa18112e 100644 --- a/editeng/inc/unomodel.hxx +++ b/editeng/inc/unomodel.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase4.hxx> -class SvxSimpleUnoModel : public cppu::WeakAggImplHelper4< +class SvxSimpleUnoModel final : public cppu::WeakAggImplHelper4< css::frame::XModel, css::ucb::XAnyCompareFactory, css::style::XStyleFamiliesSupplier, diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index 784fe796efe7..490bed017147 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -314,7 +314,7 @@ namespace emfio virtual ~GDIObj() = default; // Polymorphic base class }; - struct EMFIO_DLLPUBLIC WinMtfFontStyle : GDIObj + struct EMFIO_DLLPUBLIC WinMtfFontStyle final : GDIObj { vcl::Font aFont; @@ -326,7 +326,7 @@ namespace emfio Solid, Pattern }; - struct WinMtfFillStyle : GDIObj + struct WinMtfFillStyle final : GDIObj { Color aFillColor; bool bTransparent; @@ -359,7 +359,7 @@ namespace emfio } }; - struct WinMtfLineStyle : GDIObj + struct WinMtfLineStyle final : GDIObj { Color aLineColor; LineInfo aLineInfo; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits