diff options
Diffstat (limited to 'include/svx')
52 files changed, 88 insertions, 111 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index ba0d4a6314bf..18ce21437bcc 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -76,7 +76,7 @@ namespace o3tl // escher, but we are using it internally in to differentiate // between X_RANGE and Y_RANGE -class SVXCORE_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet +class SVXCORE_DLLPUBLIC EnhancedCustomShape2d final : public SfxItemSet { SdrObjCustomShape& mrSdrObjCustomShape; MSO_SPT eSpType; diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 78dbbbea83b8..1500b8d3bd64 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -84,7 +84,7 @@ class MaskSet; class BmpColorWindow; class ColorListBox; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow +class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask final : public SfxDockingWindow { friend class MaskData; friend class MaskSet; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index fbc74e6e31a6..fd8ae56509cf 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -256,9 +256,8 @@ public: |* \************************************************************************/ -class Svx3DCtrlItem : public SfxControllerItem +class Svx3DCtrlItem final : public SfxControllerItem { - protected: virtual void StateChangedAtToolBoxControl( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; @@ -273,11 +272,10 @@ class Svx3DCtrlItem : public SfxControllerItem |* \************************************************************************/ -class SvxConvertTo3DItem : public SfxControllerItem +class SvxConvertTo3DItem final : public SfxControllerItem { bool bState; -protected: virtual void StateChangedAtToolBoxControl(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) override; public: diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index a9b311fe522a..68cd77b17fe2 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -69,7 +69,9 @@ struct FmSearchProgress * class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides * the differences in RecordCount */ -class SAL_WARN_UNUSED FmRecordCountListener final : public cppu::WeakImplHelper< css::beans::XPropertyChangeListener > +// workaround for incremental linking bugs in MSVC2019 +class SAL_DLLPUBLIC_TEMPLATE FmRecordCountListener_Base : public cppu::WeakImplHelper< css::beans::XPropertyChangeListener > {}; +class SAL_WARN_UNUSED FmRecordCountListener final : public FmRecordCountListener_Base { // attribute Link<sal_Int32,void> m_lnkWhoWantsToKnow; diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index e8c0c7dbe4fd..1ead9069b4f0 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -144,7 +144,7 @@ protected: void setAdapter(FmXDisposeMultiplexer* pAdapter); }; -class SAL_WARN_UNUSED FmXDisposeMultiplexer : public cppu::WeakImplHelper< css::lang::XEventListener > +class SAL_WARN_UNUSED FmXDisposeMultiplexer final : public cppu::WeakImplHelper< css::lang::XEventListener > { css::uno::Reference< css::lang::XComponent> m_xObject; FmXDisposeListener* m_pListener; diff --git a/include/svx/gallerybinaryengine.hxx b/include/svx/gallerybinaryengine.hxx index 11747c5ee2ea..5e89b5dd756d 100644 --- a/include/svx/gallerybinaryengine.hxx +++ b/include/svx/gallerybinaryengine.hxx @@ -44,7 +44,7 @@ class FmFormModel; class GalleryTheme; class GalleryThemeEntry; -class SVXCORE_DLLPUBLIC GalleryBinaryEngine : public GalleryFileStorage +class SVXCORE_DLLPUBLIC GalleryBinaryEngine final : public GalleryFileStorage { private: tools::SvRef<SotStorage> m_aSvDrawStorageRef; diff --git a/include/svx/gallerybinaryengineentry.hxx b/include/svx/gallerybinaryengineentry.hxx index 042119ae7be2..48a27113ace1 100644 --- a/include/svx/gallerybinaryengineentry.hxx +++ b/include/svx/gallerybinaryengineentry.hxx @@ -29,7 +29,7 @@ class GalleryBinaryStorageLocations; class GalleryObjectCollection; class GalleryBinaryEngine; -class GalleryBinaryEngineEntry : public GalleryFileStorageEntry +class GalleryBinaryEngineEntry final : public GalleryFileStorageEntry { private: std::unique_ptr<GalleryBinaryStorageLocations> mpGalleryStorageLocations; diff --git a/include/svx/gallerybinarystoragelocations.hxx b/include/svx/gallerybinarystoragelocations.hxx index aefe1fcad3eb..6876c64a2a17 100644 --- a/include/svx/gallerybinarystoragelocations.hxx +++ b/include/svx/gallerybinarystoragelocations.hxx @@ -23,7 +23,7 @@ #include <svx/svxdllapi.h> #include <svx/gallerystoragelocations.hxx> -class SVXCORE_DLLPUBLIC GalleryBinaryStorageLocations : public GalleryStorageLocations +class SVXCORE_DLLPUBLIC GalleryBinaryStorageLocations final : public GalleryStorageLocations { private: INetURLObject maThmURL; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 0630262c040c..585293be0ae2 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -47,7 +47,7 @@ namespace unogallery class GalleryItem; } -class SVXCORE_DLLPUBLIC GalleryTheme : public SfxBroadcaster +class SVXCORE_DLLPUBLIC GalleryTheme final : public SfxBroadcaster { friend class Gallery; friend class GalleryThemeCacheEntry; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 11a5854eebd3..517addf8f843 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -128,12 +128,10 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; }; -class GraphCtrlView : public SdrView +class GraphCtrlView final : public SdrView { GraphCtrl& rGraphCtrl; -protected: - virtual void MarkListHasChanged() override { SdrView::MarkListHasChanged(); diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 08eded81b517..5d6ac5689401 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -45,7 +45,7 @@ enum SvxLinkInsertMode HLINK_HTMLMODE = 0x0080 }; -class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem +class SVX_DLLPUBLIC SvxHyperlinkItem final : public SfxPoolItem { OUString sName; OUString sURL; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 3032018de9df..3c6ea8f62010 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -81,7 +81,7 @@ class IMapOwnData; class IMapWindow; class GraphCtrl; -class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialogController +class SVX_DLLPUBLIC SvxIMapDlg final : public SfxModelessDialogController { friend class IMapOwnData; friend class IMapWindow; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 7892a085ff5e..7d397687ab37 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -168,7 +168,7 @@ class BulletsTypeMgr final : public NBOTypeMgrBase }; -class NumberingTypeMgr: public NBOTypeMgrBase +class NumberingTypeMgr final : public NBOTypeMgrBase { private: NumberingTypeMgr(const NumberingTypeMgr&) = delete; @@ -187,7 +187,7 @@ class NumberingTypeMgr: public NBOTypeMgrBase static NumberingTypeMgr& GetInstance(); }; -class OutlineTypeMgr: public NBOTypeMgrBase +class OutlineTypeMgr final : public NBOTypeMgrBase { private: OutlineTypeMgr(const OutlineTypeMgr&) = delete; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 5bdd4c9e66d7..12593c73ffc6 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -52,7 +52,7 @@ public: class SvxRubyData_Impl; -class SvxRubyDialog : public SfxModelessDialogController +class SvxRubyDialog final : public SfxModelessDialogController { friend class RubyPreview; diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 4c8b1b14a7e2..d2d91f3c3e9c 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -54,9 +54,8 @@ class Imp3DDepthRemapper; |* \************************************************************************/ -class SVXCORE_DLLPUBLIC E3dScene : public E3dObject, public SdrObjList +class SVXCORE_DLLPUBLIC E3dScene final : public E3dObject, public SdrObjList { -protected: virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; @@ -184,7 +183,7 @@ public: virtual SdrObjList* GetSubList() const override; virtual void SetTransformChanged() override; -protected: +private: virtual basegfx::B3DRange RecalcBoundVolume() const override; }; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index e8db1996a9c8..c02076bfb923 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -30,7 +30,7 @@ namespace com::sun::star::uno { class Any; } -class SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem +class SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem final : public SfxPoolItem { public: typedef std::pair < const OUString, const OUString > PropertyPair; diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 1f309ea728f8..a9712a15608d 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -28,7 +28,7 @@ // SdrGrafCropItem - -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafCropItem : public SvxGrfCrop +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafCropItem final : public SvxGrfCrop { public: diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 5a81962e8792..345082fca6b9 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -28,7 +28,7 @@ // SdrGrafGamma100Item - -class SVXCORE_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item +class SVXCORE_DLLPUBLIC SdrGrafGamma100Item final : public SfxUInt32Item { public: diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 886b3cf22344..4ef5e69e9e45 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -28,7 +28,7 @@ // SdrGrafLuminanceItem - -class SVXCORE_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafLuminanceItem final : public SdrSignedPercentItem { public: @@ -43,7 +43,7 @@ public: // SdrGrafContrastItem - -class SVXCORE_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafContrastItem final : public SdrSignedPercentItem { public: diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 9d1fbc8daf47..fa205b6db2e7 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -32,7 +32,7 @@ protected: SfxEnumItem(SDRATTR_GRAFMODE, eMode) {} }; -class SVXCORE_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base +class SVXCORE_DLLPUBLIC SdrGrafModeItem final : public SdrGrafModeItem_Base { public: SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 44e9e435afbe..95c2eda21b8f 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -32,7 +32,7 @@ class MediaItem; namespace sdr::contact { -class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj +class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj final : public ViewContactOfSdrObj { friend class ViewObjectContactOfSdrMediaObj; @@ -53,7 +53,7 @@ public: void updateMediaItem(::avmedia::MediaItem& rItem) const; void executeMediaItem(const ::avmedia::MediaItem& rItem); -protected: +private: // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. virtual ViewObjectContact& @@ -62,7 +62,6 @@ protected: // get notified if some properties have changed void mediaPropertiesChanged(const ::avmedia::MediaItem& rNewState); -protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data virtual drawinglayer::primitive2d::Primitive2DContainer diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 1208dd7724c4..79ae6bc011be 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -31,7 +31,7 @@ enum class SdrTextAniDirection Left, Right, Up, Down }; -class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> { +class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem final : public SfxEnumItem<SdrTextAniDirection> { public: SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {} virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index d977f83bec4e..69b909da5bd3 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -32,7 +32,7 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally SDRTEXTVERTADJUST_BLOCK // support vertical full with supported now /*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height (ni) -class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> { +class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem final : public SfxEnumItem<SdrTextVertAdjust> { public: SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {} @@ -56,7 +56,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted SDRTEXTHORZADJUST_BLOCK // use the whole text frame width /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni). -class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> { +class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem final : public SfxEnumItem<SdrTextHorzAdjust> { public: SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {} virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index f2dca7833118..0d86e517bb84 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -76,7 +76,7 @@ enum class SdrTextAniKind { // of the text depends on the anchor of the drawing object. This // corresponds to the position of the text in normal Paint (without scrolling). -class SVXCORE_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> { +class SVXCORE_DLLPUBLIC SdrTextAniKindItem final : public SfxEnumItem<SdrTextAniKind> { public: SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {} virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index c446bc1fbca6..d98e431dab68 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -30,7 +30,7 @@ // TextMaxFrameWidth is reached). -class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem +class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem final : public SfxEnumItem<css::drawing::TextFitToSizeType> { public: diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index cdbefe91ae58..71c956dcd69a 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -106,7 +106,7 @@ public: */ -class SVX_DLLPUBLIC SvxSearchDialog : public SfxModelessDialogController +class SVX_DLLPUBLIC SvxSearchDialog final : public SfxModelessDialogController { friend class SvxSearchController; friend class SvxSearchDialogWrapper; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 707c1ddc5a48..461937c05969 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -382,7 +382,7 @@ public: }; -class ImpEdgeHdl: public SdrHdl +class ImpEdgeHdl final : public SdrHdl { SdrEdgeLineCode eLineCode; @@ -427,7 +427,6 @@ public: class SVXCORE_DLLPUBLIC SdrHdlList { -protected: size_t mnFocusIndex; SdrMarkView* pView; std::deque<std::unique_ptr<SdrHdl>> maList; @@ -437,7 +436,6 @@ protected: bool bDistortShear : 1; bool bMoveOutside : 1; // move handles outwards (for TextEdit) -private: SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&) = delete; SVX_DLLPRIVATE void operator=(const SdrHdlList&) = delete; diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index cc9e0d4bf91b..2e35c831afee 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -104,12 +104,10 @@ friend class SdrView; friend class SdrModel; friend class SdrPage; -protected: std::vector<std::unique_ptr<SdrLayer>> maLayers; SdrLayerAdmin* pParent; // The page's admin knows the doc's admin SdrModel* pModel; // For broadcasting OUString maControlLayerName; -protected: // Find a LayerID which is not in use yet. If all have been used up, // we return 0. // If you want to play safe, check GetLayerCount()<SDRLAYER_MAXCOUNT diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 3389fd19c151..838595e70273 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -124,7 +124,7 @@ public: /// Utility class SdrEdgeObj -class SVXCORE_DLLPUBLIC SdrEdgeObj : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrEdgeObj final : public SdrTextObj { private: // to allow sdr::properties::ConnectorProperties access to ImpSetAttrToEdgeInfo() @@ -133,7 +133,6 @@ private: friend class SdrCreateView; friend class ImpEdgeHdl; -protected: virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; @@ -167,7 +166,7 @@ public: void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect = bNew; } bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; } -protected: +private: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; static XPolygon ImpCalcObjToCenter(const Point& rStPt, tools::Long nEscAngle, const tools::Rectangle& rRect, const Point& rCenter); diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 0903f448b251..bf7e329d5442 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -73,7 +73,7 @@ class SdrGraphicLink; /** * This class represents an embedded or linked bitmap graphic object. */ -class SVXCORE_DLLPUBLIC SdrGrafObj : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrGrafObj final : public SdrRectObj { private: // to allow sdr::properties::GraphicProperties access to SetXPolyDirty() @@ -118,7 +118,6 @@ private: void onGraphicChanged(); GDIMetaFile GetMetaFile(GraphicType &rGraphicType) const; -protected: // protected destructor virtual ~SdrGrafObj() override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index e3ca9abc3449..83277c5e9831 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -42,15 +42,13 @@ public: virtual ~SdrMeasureObjGeoData() override; }; -class SVXCORE_DLLPUBLIC SdrMeasureObj : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrMeasureObj final : public SdrTextObj { private: // to allow sdr::properties::MeasureProperties access to SetTextDirty() friend class sdr::properties::MeasureProperties; - friend class SdrMeasureField; -protected: virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; @@ -58,7 +56,6 @@ protected: Point aPt2; bool bTextDirty; -protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; OUString TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const; void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 9837a422572b..d5552a7c72a4 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -306,7 +306,7 @@ public: }; // class SdrPageProperties -class SVXCORE_DLLPUBLIC SdrPageProperties : public SfxListener, public svl::StyleSheetUser +class SVXCORE_DLLPUBLIC SdrPageProperties final : public SfxListener, public svl::StyleSheetUser { private: // data diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 46609570155a..7cb5eae6e399 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -61,13 +61,13 @@ inline SfxBoolItem makeSvx3DDoubleSidedItem(bool bVal) { // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry -class Svx3DReducedLineGeometryItem : public SfxBoolItem { +class Svx3DReducedLineGeometryItem final : public SfxBoolItem { public: Svx3DReducedLineGeometryItem(bool bVal = false); Svx3DReducedLineGeometryItem* Clone(SfxItemPool * = nullptr) const override; }; -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DNormalsKindItem : public SfxUInt16Item { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DNormalsKindItem final : public SfxUInt16Item { public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); @@ -81,7 +81,7 @@ inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) { return SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal); } -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionXItem : public SfxUInt16Item { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionXItem final : public SfxUInt16Item { public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); @@ -91,7 +91,7 @@ public: SVX_DLLPRIVATE virtual Svx3DTextureProjectionXItem* Clone(SfxItemPool* pPool = nullptr) const override; }; -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionYItem : public SfxUInt16Item { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionYItem final : public SfxUInt16Item { public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); @@ -142,7 +142,7 @@ inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) { } // Svx3D _3DSCENE_ Items -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DPerspectiveItem : public SfxUInt16Item { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DPerspectiveItem final : public SfxUInt16Item { public: Svx3DPerspectiveItem(ProjectionType nVal = ProjectionType::Perspective); @@ -268,7 +268,7 @@ inline SfxUInt16Item makeSvx3DShadowSlantItem(sal_uInt16 nVal) { return SfxUInt16Item(SDRATTR_3DSCENE_SHADOW_SLANT, nVal); } -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DShadeModeItem : public SfxUInt16Item { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DShadeModeItem final : public SfxUInt16Item { public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); @@ -280,35 +280,35 @@ public: // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed -class Svx3DSmoothNormalsItem : public SfxBoolItem { +class Svx3DSmoothNormalsItem final : public SfxBoolItem { public: Svx3DSmoothNormalsItem(bool bVal = true); Svx3DSmoothNormalsItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack -class Svx3DSmoothLidsItem : public SfxBoolItem { +class Svx3DSmoothLidsItem final : public SfxBoolItem { public: Svx3DSmoothLidsItem(bool bVal = false); Svx3DSmoothLidsItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode -class Svx3DCharacterModeItem : public SfxBoolItem { +class Svx3DCharacterModeItem final : public SfxBoolItem { public: Svx3DCharacterModeItem(bool bVal = false); Svx3DCharacterModeItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseFrontItem : public SfxBoolItem { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseFrontItem final : public SfxBoolItem { public: Svx3DCloseFrontItem(bool bVal = true); Svx3DCloseFrontItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack -class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseBackItem : public SfxBoolItem { +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseBackItem final : public SfxBoolItem { public: Svx3DCloseBackItem(bool bVal = true); Svx3DCloseBackItem* Clone(SfxItemPool * = nullptr) const override; diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index cb36eb75d1da..dae0a918d889 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -30,7 +30,7 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit }; // class SdrCaptionEscDirItem -class SVXCORE_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem<SdrCaptionEscDir> { +class SVXCORE_DLLPUBLIC SdrCaptionEscDirItem final : public SfxEnumItem<SdrCaptionEscDir> { public: SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {} virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -46,7 +46,7 @@ public: // sal_True = line escape position is relative // sal_False = line escape position is absolute -class SVXCORE_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrCaptionEscIsRelItem final : public SdrYesNoItem { public: SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} virtual ~SdrCaptionEscIsRelItem() override; @@ -65,7 +65,7 @@ public: // 10000 = 100.00% = right resp. down // only when SdrCaptionEscIsRelItem=TRUE -class SVXCORE_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { +class SVXCORE_DLLPUBLIC SdrCaptionEscRelItem final : public SfxInt32Item { public: SdrCaptionEscRelItem(tools::Long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} virtual ~SdrCaptionEscRelItem() override; @@ -84,7 +84,7 @@ public: // >0 = in direction right resp. down // only when SdrCaptionEscIsRelItem=FALSE -class SdrCaptionEscAbsItem: public SdrMetricItem { +class SdrCaptionEscAbsItem final : public SdrMetricItem { public: SdrCaptionEscAbsItem(tools::Long nEscAbs=0): SdrMetricItem(SDRATTR_CAPTIONESCABS,nEscAbs) {} virtual SdrCaptionEscAbsItem* Clone(SfxItemPool*) const override diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index f73838f4eba0..8ac03f0eaf84 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -28,7 +28,7 @@ * Only for Type3 and Type4 * Only relevant, if SdrCaptionFitLineLenItem = false */ -class SVXCORE_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrCaptionLineLenItem final : public SdrMetricItem { public: SdrCaptionLineLenItem(tools::Long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} virtual ~SdrCaptionLineLenItem() override; @@ -44,7 +44,7 @@ public: * The length of the first caption line is either automatically * calculated or the default setting is used (SdrCaptionLineLenItem) */ -class SVXCORE_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrCaptionFitLineLenItem final : public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} virtual ~SdrCaptionFitLineLenItem() override; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 6c2b728a2735..3d46f54cb0bd 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -27,7 +27,7 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 }; -class SVXCORE_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> { +class SVXCORE_DLLPUBLIC SdrCaptionTypeItem final : public SfxEnumItem<SdrCaptionType> { public: SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 36a9b72d5083..fd54d38bbbe2 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -28,7 +28,7 @@ enum class SdrEdgeKind OrthoLines, ThreeLines, OneLine, Bezier, Arc }; -class SVXCORE_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> { +class SVXCORE_DLLPUBLIC SdrEdgeKindItem final : public SfxEnumItem<SdrEdgeKind> { public: SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index 81cae31f3f5a..c957070ce271 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -22,7 +22,7 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -class SdrEdgeLineDeltaCountItem : public SfxUInt16Item +class SdrEdgeLineDeltaCountItem final : public SfxUInt16Item { public: SdrEdgeLineDeltaCountItem(sal_uInt16 nVal = 0) diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index 82ff4b7c348e..de7accd9b2b6 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -23,7 +23,7 @@ #include <svx/sdmetitm.hxx> #include <svx/svxdllapi.h> -class SVXCORE_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode1HorzDistItem final : public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -31,7 +31,7 @@ public: virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SVXCORE_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode1VertDistItem final : public SdrMetricItem { public: SdrEdgeNode1VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -39,7 +39,7 @@ public: virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SVXCORE_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode2HorzDistItem final : public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -47,7 +47,7 @@ public: virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SVXCORE_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode2VertDistItem final : public SdrMetricItem { public: SdrEdgeNode2VertDistItem(tools::Long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -55,13 +55,13 @@ public: virtual SdrEdgeNode2VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SdrEdgeNode1GlueDistItem: public SdrMetricItem { +class SdrEdgeNode1GlueDistItem final : public SdrMetricItem { public: SdrEdgeNode1GlueDistItem(tools::Long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1GLUEDIST,nVal) {} virtual SdrEdgeNode1GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SdrEdgeNode2GlueDistItem: public SdrMetricItem { +class SdrEdgeNode2GlueDistItem final : public SdrMetricItem { public: SdrEdgeNode2GlueDistItem(tools::Long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2GLUEDIST,nVal) {} virtual SdrEdgeNode2GlueDistItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index c26d2b25f217..022656aaa142 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -29,7 +29,7 @@ // TextUpsideDown, but easily operated) // can also be dragged by dragging the measure line item // (SdrMeasureLineDistItem) over the reference edge -class SVXCORE_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrMeasureBelowRefEdgeItem final : public SdrYesNoItem { public: SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} virtual ~SdrMeasureBelowRefEdgeItem() override; diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index 2e89ebebd127..11de732865a7 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -27,7 +27,7 @@ // Nail text down to a fix angle. // The text angle is independent of the dimension line. // Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.) -class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { +class SdrMeasureTextIsFixedAngleItem final : public SdrYesNoItem { public: SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} virtual ~SdrMeasureTextIsFixedAngleItem() override; @@ -40,7 +40,7 @@ public: }; //Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.) -class SdrMeasureTextFixedAngleItem: public SdrAngleItem { +class SdrMeasureTextFixedAngleItem final : public SdrAngleItem { public: SdrMeasureTextFixedAngleItem(Degree100 nVal=0_deg100): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} virtual ~SdrMeasureTextFixedAngleItem() override; @@ -53,7 +53,7 @@ public: }; // The decimal places used for the measure value -class SVXCORE_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { +class SVXCORE_DLLPUBLIC SdrMeasureDecimalPlacesItem final : public SfxInt16Item { public: SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} virtual ~SdrMeasureDecimalPlacesItem() override; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 3a751b419749..2445909e2fd4 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/drawing/MeasureTextHorzPos.hpp> #include <com/sun/star/drawing/MeasureTextVertPos.hpp> -class SVXCORE_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem<css::drawing::MeasureTextHorzPos> { +class SVXCORE_DLLPUBLIC SdrMeasureTextHPosItem final : public SfxEnumItem<css::drawing::MeasureTextHorzPos> { public: SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) @@ -41,7 +41,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; -class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem<css::drawing::MeasureTextVertPos> { +class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem final : public SfxEnumItem<css::drawing::MeasureTextVertPos> { public: SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index e208d2790d29..184a59f39307 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -23,7 +23,7 @@ #include <svx/sdynitm.hxx> // text across the dimension line (90deg counter-clockwise rotation) -class SVXCORE_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrMeasureTextRota90Item final : public SdrYesNoItem { public: SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} virtual ~SdrMeasureTextRota90Item() override; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index e350e9677774..ab0ad8a3cd35 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -26,7 +26,7 @@ // specification of the unit if measurement. The numerical quantity value is converted in this unity. // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. -class SVXCORE_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> { +class SVXCORE_DLLPUBLIC SdrMeasureUnitItem final : public SfxEnumItem<FieldUnit> { public: SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 75c152e76744..2dc2f5c59843 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -479,7 +479,7 @@ public: /*********************************************************************** * * ***********************************************************************/ -class SvxShapeConnector : public css::drawing::XConnectorShape, +class SvxShapeConnector final : public css::drawing::XConnectorShape, public SvxShapeText { public: diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index bfc67952ce97..0882081fb7ca 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -28,7 +28,7 @@ class SdrModel; -class SVXCORE_DLLPUBLIC XFillBitmapItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XFillBitmapItem final : public NameOrIndex { private: GraphicObject maGraphicObject; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index e33b57e0f4ee..bd8a54a240ce 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -27,7 +27,7 @@ -class SVXCORE_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem +class SVXCORE_DLLPUBLIC XFillFloatTransparenceItem final : public XFillGradientItem { private: diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 1ef7d4e11d55..9eb8805415aa 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -29,7 +29,7 @@ class SdrModel; -class SVXCORE_DLLPUBLIC XFillHatchItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XFillHatchItem final : public NameOrIndex { XHatch aHatch; diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index c9ec5d711de5..04b40d41fab2 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -30,7 +30,7 @@ class SdrModel; -class SVXCORE_DLLPUBLIC XLineDashItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XLineDashItem final : public NameOrIndex { XDash aDash; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 6cb8cf402efc..fde707675f6a 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -25,7 +25,7 @@ -class SVXCORE_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem +class SVXCORE_DLLPUBLIC XLineEndCenterItem final : public SfxBoolItem { public: XLineEndCenterItem(bool bEndCenter = false); diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index bde8c597d8b0..a48307cab525 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -25,7 +25,7 @@ -class SVXCORE_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem +class SVXCORE_DLLPUBLIC XLineStartCenterItem final : public SfxBoolItem { public: XLineStartCenterItem(bool bStartCenter = false); diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index a4e192a0704a..c56c6d092688 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -234,9 +234,8 @@ public: rtl::Reference<XPropertyList> const & plist); }; -class SVXCORE_DLLPUBLIC XColorList : public XPropertyList +class SVXCORE_DLLPUBLIC XColorList final : public XPropertyList { -protected: virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: @@ -253,9 +252,8 @@ public: static XColorListRef GetStdColorList(); // returns a singleton }; -class SVXCORE_DLLPUBLIC XLineEndList : public XPropertyList +class SVXCORE_DLLPUBLIC XLineEndList final : public XPropertyList { -protected: virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: @@ -268,14 +266,13 @@ public: virtual bool Create() override; }; -class SVXCORE_DLLPUBLIC XDashList : public XPropertyList +class SVXCORE_DLLPUBLIC XDashList final : public XPropertyList { private: BitmapEx maBitmapSolidLine; OUString maStringSolidLine; OUString maStringNoLine; -protected: static BitmapEx ImpCreateBitmapForXDash(const XDash* pDash); virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; @@ -300,11 +297,10 @@ public: OUString const & GetStringForUiNoLine() const; }; -class SVXCORE_DLLPUBLIC XHatchList : public XPropertyList +class SVXCORE_DLLPUBLIC XHatchList final : public XPropertyList { private: BitmapEx CreateBitmap(tools::Long nIndex, const Size& rSize) const; -protected: virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: XHatchList(const OUString& rPath, const OUString& rReferer); @@ -318,12 +314,10 @@ public: virtual bool Create() override; }; -class SVXCORE_DLLPUBLIC XGradientList : public XPropertyList +class SVXCORE_DLLPUBLIC XGradientList final : public XPropertyList { private: BitmapEx CreateBitmap(tools::Long nIndex, const Size& rSize) const; - -protected: virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: @@ -338,12 +332,10 @@ public: virtual bool Create() override; }; -class SVXCORE_DLLPUBLIC XBitmapList : public XPropertyList +class SVXCORE_DLLPUBLIC XBitmapList final : public XPropertyList { private: BitmapEx CreateBitmap( tools::Long nIndex, const Size& rSize ) const; - -protected: virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: @@ -357,12 +349,10 @@ public: virtual bool Create() override; }; -class SVXCORE_DLLPUBLIC XPatternList : public XPropertyList +class SVXCORE_DLLPUBLIC XPatternList final : public XPropertyList { private: BitmapEx CreateBitmap( tools::Long nIndex, const Size& rSize ) const; - -protected: virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override; public: |