diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-24 15:43:40 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-25 14:09:39 +0200 |
commit | 060bab5d3c87468d769fc0de8b2d96411414816a (patch) | |
tree | 0873ea4f868c058d3a61112140e79cc7764015c4 /svx/inc | |
parent | fc45cc4899444c218637970ad7537fe7d92077a8 (diff) |
loplugin:finalclasses in svx
Change-Id: I7dd8d1a900694687fbed3f3f29b0ea4bb11b7d72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117790
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/inc')
30 files changed, 54 insertions, 59 deletions
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index 979fa64d3451..6fe03c15363b 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -142,7 +142,7 @@ typedef ::cppu::WeakImplHelper< css::accessibility::XAccessibleTableSelection > AccessibleTableHeaderShape_BASE; -class AccessibleTableHeaderShape : public MutexOwner, +class AccessibleTableHeaderShape final : public MutexOwner, public AccessibleTableHeaderShape_BASE { public: diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 2640184846e3..fc97d9bccdb5 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -67,7 +67,7 @@ struct DispatchInfo; namespace svx::sidebar { class GalleryControl; } -class GalleryBrowser2 : public SfxListener +class GalleryBrowser2 final : public SfxListener { friend class GalleryBrowser; friend class svx::sidebar::GalleryControl; @@ -158,7 +158,7 @@ public: DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); }; -class GalleryDragDrop : public DropTargetHelper +class GalleryDragDrop final : public DropTargetHelper { private: GalleryBrowser2* m_pParent; diff --git a/svx/inc/galleryobjectbinarystorage.hxx b/svx/inc/galleryobjectbinarystorage.hxx index 85dd9e22836c..611ff637bead 100644 --- a/svx/inc/galleryobjectbinarystorage.hxx +++ b/svx/inc/galleryobjectbinarystorage.hxx @@ -22,7 +22,7 @@ #include <tools/urlobj.hxx> #include <svx/galleryobjectstorage.hxx> -class GalleryObjectBinaryStorage : public GalleryObjectStorage +class GalleryObjectBinaryStorage final : public GalleryObjectStorage { private: INetURLObject m_aURL; diff --git a/svx/inc/galleryobjectxmlstorage.hxx b/svx/inc/galleryobjectxmlstorage.hxx index 35a9384524f9..f72d7067a38f 100644 --- a/svx/inc/galleryobjectxmlstorage.hxx +++ b/svx/inc/galleryobjectxmlstorage.hxx @@ -22,7 +22,7 @@ #include <tools/urlobj.hxx> #include <svx/galleryobjectstorage.hxx> -class GalleryObjectXMLStorage : public GalleryObjectStorage +class GalleryObjectXMLStorage final : public GalleryObjectStorage { private: INetURLObject m_aURL; diff --git a/svx/inc/sdgcoitm.hxx b/svx/inc/sdgcoitm.hxx index 7d77643aeea5..d49bad207275 100644 --- a/svx/inc/sdgcoitm.hxx +++ b/svx/inc/sdgcoitm.hxx @@ -28,7 +28,7 @@ // SdrGrafRedItem - -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafRedItem : public SdrSignedPercentItem +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafRedItem final : public SdrSignedPercentItem { public: @@ -42,7 +42,7 @@ public: // SdrGrafGreenItem - -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafGreenItem : public SdrSignedPercentItem +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafGreenItem final : public SdrSignedPercentItem { public: @@ -56,7 +56,7 @@ public: // SdrGrafBlueItem - -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafBlueItem : public SdrSignedPercentItem +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafBlueItem final : public SdrSignedPercentItem { public: diff --git a/svx/inc/sdginitm.hxx b/svx/inc/sdginitm.hxx index ef5ef1a02db6..35cfa3da7865 100644 --- a/svx/inc/sdginitm.hxx +++ b/svx/inc/sdginitm.hxx @@ -26,7 +26,7 @@ // SdrGrafInvertItem - -class SdrGrafInvertItem : public SdrOnOffItem +class SdrGrafInvertItem final : public SdrOnOffItem { public: diff --git a/svx/inc/sdgtritm.hxx b/svx/inc/sdgtritm.hxx index 001e30e7d712..084ac694493d 100644 --- a/svx/inc/sdgtritm.hxx +++ b/svx/inc/sdgtritm.hxx @@ -28,7 +28,7 @@ // SdrGrafTransparenceItem - -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafTransparenceItem : public SdrPercentItem +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafTransparenceItem final : public SdrPercentItem { public: diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx index 4168d1aa718a..59e49b5f2a62 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx @@ -149,7 +149,7 @@ public: bool getFront() const { return mbFront; } }; -class ViewContactOfSdrPage : public ViewContact +class ViewContactOfSdrPage final : public ViewContact { // the owner of this ViewContact. Set from constructor and not // to be changed in any way. @@ -168,7 +168,6 @@ class ViewContactOfSdrPage : public ViewContact ViewContactOfGrid maViewContactOfGridFront; ViewContactOfHelplines maViewContactOfHelplinesFront; -protected: // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create // a standard ViewObjectContact containing the given ObjectContact and *this @@ -192,7 +191,7 @@ public: // React on changes of the object of this ViewContact virtual void ActionChanged() override; -protected: +private: // This method is responsible for creating the graphical visualisation data // ONLY based on model data virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index 824051543250..8d16362aa092 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -39,7 +39,7 @@ namespace sdr::contact { //= ViewContactOfUnoControl - class ViewContactOfUnoControl : public ViewContactOfSdrObj + class ViewContactOfUnoControl final : public ViewContactOfSdrObj { public: // access to SdrObject @@ -57,14 +57,12 @@ namespace sdr::contact { css::uno::Reference< css::awt::XControl > getTemporaryControlForWindow( const vcl::Window& _rWindow, css::uno::Reference< css::awt::XControlContainer >& _inout_ControlContainer ) const; - protected: + private: virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) override; - private: ViewContactOfUnoControl( const ViewContactOfUnoControl& ) = delete; ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) = delete; - protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data virtual drawinglayer::primitive2d::Primitive2DContainer createViewIndependentPrimitive2DSequence() const override; diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 7b837e1bf6d6..e84ef0a4d3e8 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -30,7 +30,7 @@ namespace drawinglayer::primitive2d { - class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D + class SdrCustomShapePrimitive2D final : public BufferedDecompositionPrimitive2D { private: attribute::SdrEffectsTextAttribute maSdrSTAttribute; @@ -47,7 +47,6 @@ namespace drawinglayer::primitive2d basegfx::B2DHomMatrix maTransform; - protected: // local decomposition. virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override; diff --git a/svx/inc/sxallitm.hxx b/svx/inc/sxallitm.hxx index a02f95b06361..144d3bae2b07 100644 --- a/svx/inc/sxallitm.hxx +++ b/svx/inc/sxallitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrAllPositionXItem: public SdrMetricItem { +class SdrAllPositionXItem final : public SdrMetricItem { public: SdrAllPositionXItem(tools::Long nPosX=0): SdrMetricItem(SDRATTR_ALLPOSITIONX,nPosX) {} virtual SdrAllPositionXItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrAllPositionYItem: public SdrMetricItem { +class SdrAllPositionYItem final : public SdrMetricItem { public: SdrAllPositionYItem(tools::Long nPosY=0): SdrMetricItem(SDRATTR_ALLPOSITIONY,nPosY) {} virtual SdrAllPositionYItem* Clone(SfxItemPool*) const override @@ -40,7 +40,7 @@ public: } }; -class SdrAllSizeWidthItem: public SdrMetricItem { +class SdrAllSizeWidthItem final : public SdrMetricItem { public: SdrAllSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_ALLSIZEWIDTH,nWdt) {} virtual SdrAllSizeWidthItem* Clone(SfxItemPool*) const override @@ -49,7 +49,7 @@ public: } }; -class SdrAllSizeHeightItem: public SdrMetricItem { +class SdrAllSizeHeightItem final : public SdrMetricItem { public: SdrAllSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_ALLSIZEHEIGHT,nHgt) {} virtual SdrAllSizeHeightItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx index c3fc7ce475c0..738e59366524 100644 --- a/svx/inc/sxcikitm.hxx +++ b/svx/inc/sxcikitm.hxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svx/svdocirc.hxx> -class SdrCircKindItem: public SfxEnumItem<SdrCircKind> { +class SdrCircKindItem final : public SfxEnumItem<SdrCircKind> { public: SdrCircKindItem(SdrCircKind eKind=SdrCircKind::Full): SfxEnumItem(SDRATTR_CIRCKIND, eKind) {} virtual SdrCircKindItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/svx/inc/sxlayitm.hxx b/svx/inc/sxlayitm.hxx index 6260ae4147bd..a52c47f3d9af 100644 --- a/svx/inc/sxlayitm.hxx +++ b/svx/inc/sxlayitm.hxx @@ -24,14 +24,14 @@ #include <svl/intitem.hxx> #include <svx/svdtypes.hxx> -class SdrLayerIdItem: public SfxUInt16Item { +class SdrLayerIdItem final : public SfxUInt16Item { public: SdrLayerIdItem(SdrLayerID nId): SfxUInt16Item(SDRATTR_LAYERID,sal_uInt8(nId)) {} SdrLayerID GetValue() const { return SdrLayerID(SfxUInt16Item::GetValue()); } virtual SdrLayerIdItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SdrLayerNameItem: public SfxStringItem { +class SdrLayerNameItem final : public SfxStringItem { public: SdrLayerNameItem() : SfxStringItem() { SetWhich(SDRATTR_LAYERNAME); } SdrLayerNameItem(const OUString& rStr) : SfxStringItem(SDRATTR_LAYERNAME,rStr) {} diff --git a/svx/inc/sxlogitm.hxx b/svx/inc/sxlogitm.hxx index 46a18b6f8db5..20d61724b303 100644 --- a/svx/inc/sxlogitm.hxx +++ b/svx/inc/sxlogitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrLogicSizeWidthItem: public SdrMetricItem { +class SdrLogicSizeWidthItem final : public SdrMetricItem { public: SdrLogicSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_LOGICSIZEWIDTH,nWdt) {} virtual SdrLogicSizeWidthItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrLogicSizeHeightItem: public SdrMetricItem { +class SdrLogicSizeHeightItem final : public SdrMetricItem { public: SdrLogicSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_LOGICSIZEHEIGHT,nHgt) {} virtual SdrLogicSizeHeightItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxmfsitm.hxx b/svx/inc/sxmfsitm.hxx index 5a9049740481..c3c070952326 100644 --- a/svx/inc/sxmfsitm.hxx +++ b/svx/inc/sxmfsitm.hxx @@ -23,7 +23,7 @@ // Format string (similar to Calc), e.g. "#.###,00km" // overwrites SdrMeasureUnitItem and SdrMeasureShowUnitItem -class SdrMeasureFormatStringItem: public SfxStringItem { +class SdrMeasureFormatStringItem final : public SfxStringItem { public: SdrMeasureFormatStringItem() : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); } virtual SdrMeasureFormatStringItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx index bebcda57b642..12769a08577f 100644 --- a/svx/inc/sxmkitm.hxx +++ b/svx/inc/sxmkitm.hxx @@ -26,7 +26,7 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. -class SdrMeasureKindItem: public SfxEnumItem<SdrMeasureKind> { +class SdrMeasureKindItem final : public SfxEnumItem<SdrMeasureKind> { public: SdrMeasureKindItem() : SfxEnumItem(SDRATTR_MEASUREKIND, SDRMEASURE_STD) {} virtual SdrMeasureKindItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/svx/inc/sxmoitm.hxx b/svx/inc/sxmoitm.hxx index 24ee1fc32b6b..f207f7411794 100644 --- a/svx/inc/sxmoitm.hxx +++ b/svx/inc/sxmoitm.hxx @@ -24,7 +24,7 @@ // Overlap of the measure line over the measure helper lines // Only of the measure arrows are on the outside -class SdrMeasureOverhangItem : public SdrMetricItem +class SdrMeasureOverhangItem final : public SdrMetricItem { public: SdrMeasureOverhangItem(tools::Long nVal) diff --git a/svx/inc/sxmovitm.hxx b/svx/inc/sxmovitm.hxx index d3a4087c6f13..eda423e27c87 100644 --- a/svx/inc/sxmovitm.hxx +++ b/svx/inc/sxmovitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrMoveXItem: public SdrMetricItem { +class SdrMoveXItem final : public SdrMetricItem { public: SdrMoveXItem(): SdrMetricItem(SDRATTR_MOVEX,0) {} SdrMoveXItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrMoveYItem: public SdrMetricItem { +class SdrMoveYItem final : public SdrMetricItem { public: SdrMoveYItem(): SdrMetricItem(SDRATTR_MOVEY,0) {} SdrMoveYItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxmtaitm.hxx b/svx/inc/sxmtaitm.hxx index 8798b05e13de..cb94874bdf62 100644 --- a/svx/inc/sxmtaitm.hxx +++ b/svx/inc/sxmtaitm.hxx @@ -25,7 +25,7 @@ // Turn text automatically in wright position (automatic UpsideDown). // TextUpsideDown stays active and turns the text again if sal_True. -class SdrMeasureTextAutoAngleItem: public SdrYesNoItem { +class SdrMeasureTextAutoAngleItem final : public SdrYesNoItem { public: SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {} virtual SdrMeasureTextAutoAngleItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxoneitm.hxx b/svx/inc/sxoneitm.hxx index 0799c94b1b71..424563008bfb 100644 --- a/svx/inc/sxoneitm.hxx +++ b/svx/inc/sxoneitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrOnePositionXItem: public SdrMetricItem { +class SdrOnePositionXItem final : public SdrMetricItem { public: SdrOnePositionXItem(tools::Long nPosX=0): SdrMetricItem(SDRATTR_ONEPOSITIONX,nPosX) {} virtual SdrOnePositionXItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrOnePositionYItem: public SdrMetricItem { +class SdrOnePositionYItem final : public SdrMetricItem { public: SdrOnePositionYItem(tools::Long nPosY=0): SdrMetricItem(SDRATTR_ONEPOSITIONY,nPosY) {} virtual SdrOnePositionYItem* Clone(SfxItemPool*) const override @@ -40,7 +40,7 @@ public: } }; -class SdrOneSizeWidthItem: public SdrMetricItem { +class SdrOneSizeWidthItem final : public SdrMetricItem { public: SdrOneSizeWidthItem(tools::Long nWdt=0): SdrMetricItem(SDRATTR_ONESIZEWIDTH,nWdt) {} virtual SdrOneSizeWidthItem* Clone(SfxItemPool*) const override @@ -49,7 +49,7 @@ public: } }; -class SdrOneSizeHeightItem: public SdrMetricItem { +class SdrOneSizeHeightItem final : public SdrMetricItem { public: SdrOneSizeHeightItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_ONESIZEHEIGHT,nHgt) {} virtual SdrOneSizeHeightItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxopitm.hxx b/svx/inc/sxopitm.hxx index b0d45bd54323..cd7d2bb1f599 100644 --- a/svx/inc/sxopitm.hxx +++ b/svx/inc/sxopitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> -class SdrObjPrintableItem: public SdrYesNoItem { +class SdrObjPrintableItem final : public SdrYesNoItem { public: SdrObjPrintableItem(bool bOn=false): SdrYesNoItem(SDRATTR_OBJPRINTABLE,bOn) {} virtual SdrObjPrintableItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrObjVisibleItem: public SdrYesNoItem { +class SdrObjVisibleItem final : public SdrYesNoItem { public: SdrObjVisibleItem(bool bOn=true): SdrYesNoItem(SDRATTR_OBJVISIBLE,bOn) {} virtual SdrObjVisibleItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxreaitm.hxx b/svx/inc/sxreaitm.hxx index b7675a63c88c..2887e8ba0aab 100644 --- a/svx/inc/sxreaitm.hxx +++ b/svx/inc/sxreaitm.hxx @@ -23,7 +23,7 @@ #include "sxfiitm.hxx" -class SdrResizeXAllItem: public SdrFractionItem { +class SdrResizeXAllItem final : public SdrFractionItem { public: SdrResizeXAllItem(): SdrFractionItem(SDRATTR_RESIZEXALL,Fraction(1,1)) {} virtual SdrResizeXAllItem* Clone(SfxItemPool*) const override @@ -32,7 +32,7 @@ public: } }; -class SdrResizeYAllItem: public SdrFractionItem { +class SdrResizeYAllItem final : public SdrFractionItem { public: SdrResizeYAllItem(): SdrFractionItem(SDRATTR_RESIZEYALL,Fraction(1,1)) {} virtual SdrResizeYAllItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxreoitm.hxx b/svx/inc/sxreoitm.hxx index b619f57f888a..19d1cb6b8c54 100644 --- a/svx/inc/sxreoitm.hxx +++ b/svx/inc/sxreoitm.hxx @@ -23,7 +23,7 @@ #include "sxfiitm.hxx" -class SdrResizeXOneItem: public SdrFractionItem { +class SdrResizeXOneItem final : public SdrFractionItem { public: SdrResizeXOneItem(): SdrFractionItem(SDRATTR_RESIZEXONE,Fraction(1,1)) {} SdrResizeXOneItem* Clone(SfxItemPool*) const override @@ -32,7 +32,7 @@ public: } }; -class SdrResizeYOneItem: public SdrFractionItem { +class SdrResizeYOneItem final : public SdrFractionItem { public: SdrResizeYOneItem(): SdrFractionItem(SDRATTR_RESIZEYONE,Fraction(1,1)) {} SdrResizeYOneItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxrooitm.hxx b/svx/inc/sxrooitm.hxx index 39cef3d4b1d2..f14bcf77f153 100644 --- a/svx/inc/sxrooitm.hxx +++ b/svx/inc/sxrooitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -class SdrRotateOneItem: public SdrAngleItem { +class SdrRotateOneItem final : public SdrAngleItem { public: SdrRotateOneItem(): SdrAngleItem(SDRATTR_ROTATEONE,0_deg100) {} SdrRotateOneItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxsaitm.hxx b/svx/inc/sxsaitm.hxx index 01824ef9e4a1..190d66d7b653 100644 --- a/svx/inc/sxsaitm.hxx +++ b/svx/inc/sxsaitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -class SdrShearAngleItem : public SdrAngleItem +class SdrShearAngleItem final : public SdrAngleItem { public: SdrShearAngleItem(Degree100 nAngle = 0_deg100) diff --git a/svx/inc/sxsalitm.hxx b/svx/inc/sxsalitm.hxx index 6e0cb2b38f70..304396206ac0 100644 --- a/svx/inc/sxsalitm.hxx +++ b/svx/inc/sxsalitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -class SdrHorzShearAllItem: public SdrAngleItem { +class SdrHorzShearAllItem final : public SdrAngleItem { public: SdrHorzShearAllItem(): SdrAngleItem(SDRATTR_HORZSHEARALL,0_deg100) {} virtual SdrHorzShearAllItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrVertShearAllItem: public SdrAngleItem { +class SdrVertShearAllItem final : public SdrAngleItem { public: SdrVertShearAllItem(): SdrAngleItem(SDRATTR_VERTSHEARALL,0_deg100) {} virtual SdrVertShearAllItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxsoitm.hxx b/svx/inc/sxsoitm.hxx index 75faab3f1d66..ce5ce237e1ee 100644 --- a/svx/inc/sxsoitm.hxx +++ b/svx/inc/sxsoitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -class SdrHorzShearOneItem: public SdrAngleItem { +class SdrHorzShearOneItem final : public SdrAngleItem { public: SdrHorzShearOneItem(): SdrAngleItem(SDRATTR_HORZSHEARONE,0_deg100) {} SdrHorzShearOneItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrVertShearOneItem: public SdrAngleItem { +class SdrVertShearOneItem final : public SdrAngleItem { public: SdrVertShearOneItem(): SdrAngleItem(SDRATTR_VERTSHEARONE,0_deg100) {} SdrVertShearOneItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/sxtraitm.hxx b/svx/inc/sxtraitm.hxx index d5035ffbd6b7..2a1fdec4ccca 100644 --- a/svx/inc/sxtraitm.hxx +++ b/svx/inc/sxtraitm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrTransformRef1XItem: public SdrMetricItem { +class SdrTransformRef1XItem final : public SdrMetricItem { public: SdrTransformRef1XItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1X,nHgt) {} virtual SdrTransformRef1XItem* Clone(SfxItemPool*) const override @@ -31,7 +31,7 @@ public: } }; -class SdrTransformRef1YItem: public SdrMetricItem { +class SdrTransformRef1YItem final : public SdrMetricItem { public: SdrTransformRef1YItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF1Y,nHgt) {} virtual SdrTransformRef1YItem* Clone(SfxItemPool*) const override @@ -40,7 +40,7 @@ public: } }; -class SdrTransformRef2XItem: public SdrMetricItem { +class SdrTransformRef2XItem final : public SdrMetricItem { public: SdrTransformRef2XItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2X,nHgt) {} virtual SdrTransformRef2XItem* Clone(SfxItemPool*) const override @@ -49,7 +49,7 @@ public: } }; -class SdrTransformRef2YItem: public SdrMetricItem { +class SdrTransformRef2YItem final : public SdrMetricItem { public: SdrTransformRef2YItem(tools::Long nHgt=0): SdrMetricItem(SDRATTR_TRANSFORMREF2Y,nHgt) {} virtual SdrTransformRef2YItem* Clone(SfxItemPool*) const override diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx index df7751f9b58d..e6520f862a16 100644 --- a/svx/inc/tbxcolorupdate.hxx +++ b/svx/inc/tbxcolorupdate.hxx @@ -86,7 +86,7 @@ namespace svx virtual Size GetItemSize(const Size& rImageSize) const = 0; }; - class VclToolboxButtonColorUpdater : public ToolboxButtonColorUpdaterBase + class VclToolboxButtonColorUpdater final : public ToolboxButtonColorUpdaterBase { public: VclToolboxButtonColorUpdater(sal_uInt16 nSlotId, ToolBoxItemId nTbxBtnId, ToolBox* ptrTbx, bool bWideButton, @@ -106,7 +106,7 @@ namespace svx virtual Size GetItemSize(const Size& rImageSize) const override; }; - class ToolboxButtonColorUpdater : public ToolboxButtonColorUpdaterBase + class ToolboxButtonColorUpdater final : public ToolboxButtonColorUpdaterBase { public: ToolboxButtonColorUpdater(sal_uInt16 nSlotId, const OString& rTbxBtnId, weld::Toolbar* ptrTbx, bool bWideButton, diff --git a/svx/inc/textchainflow.hxx b/svx/inc/textchainflow.hxx index e8ffd654b5b6..a46c47a2d59a 100644 --- a/svx/inc/textchainflow.hxx +++ b/svx/inc/textchainflow.hxx @@ -83,7 +83,7 @@ private: }; // NOTE: EditingTextChainFlow might be strongly coupled with behavior in SdrTextObj::onChainingEvent -class EditingTextChainFlow : public TextChainFlow +class EditingTextChainFlow final : public TextChainFlow { public: EditingTextChainFlow(SdrTextObj*); @@ -91,12 +91,11 @@ public: //virtual void ExecuteOverflow(SdrOutliner *, SdrOutliner *) override; -protected: +private: virtual void impLeaveOnlyNonOverflowingText(SdrOutliner*) override; virtual void impSetFlowOutlinerParams(SdrOutliner*, SdrOutliner*) override; -private: void impBroadcastCursorInfo() const; }; |