diff options
author | Noel <noel.grandin@collabora.co.uk> | 2021-01-29 13:51:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-30 08:13:50 +0100 |
commit | 5346b2556348477dcec371913d5924c6badfa2c7 (patch) | |
tree | e6f84360df23c0b552cddc597b7be0700dce3b13 /sw | |
parent | 8f69a05ad7404590f2e4a1ba8d4d69fe896523ce (diff) |
loplugin:finalclasses in sw
Change-Id: Ib939c1f34ae79abfc077080d2c2561ee0ee4a4fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110156
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
80 files changed, 127 insertions, 141 deletions
diff --git a/sw/source/core/inc/DocumentChartDataProviderManager.hxx b/sw/source/core/inc/DocumentChartDataProviderManager.hxx index 1759f5b94982..49282bacc634 100644 --- a/sw/source/core/inc/DocumentChartDataProviderManager.hxx +++ b/sw/source/core/inc/DocumentChartDataProviderManager.hxx @@ -33,7 +33,7 @@ class SwDoc; namespace sw { -class DocumentChartDataProviderManager : public IDocumentChartDataProviderAccess +class DocumentChartDataProviderManager final : public IDocumentChartDataProviderAccess { public: diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index 4880fc75eaf4..e99c54c1002c 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -32,7 +32,7 @@ class SwPrintData; namespace sw { -class DocumentDeviceManager : public IDocumentDeviceAccess +class DocumentDeviceManager final : public IDocumentDeviceAccess { public: DocumentDeviceManager(SwDoc& i_rSwdoc); diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index b55dd333ba99..26fd603a67e9 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -30,7 +30,7 @@ class SwDoc; namespace sw { -class DocumentDrawModelManager : public IDocumentDrawModelAccess +class DocumentDrawModelManager final : public IDocumentDrawModelAccess { public: DocumentDrawModelManager(SwDoc& i_rSwdoc); diff --git a/sw/source/core/inc/DocumentExternalDataManager.hxx b/sw/source/core/inc/DocumentExternalDataManager.hxx index 3cbe1957d910..bc80ac429f99 100644 --- a/sw/source/core/inc/DocumentExternalDataManager.hxx +++ b/sw/source/core/inc/DocumentExternalDataManager.hxx @@ -24,7 +24,7 @@ namespace sw { -class DocumentExternalDataManager : public IDocumentExternalData +class DocumentExternalDataManager final : public IDocumentExternalData { private: DocumentExternalDataManager(DocumentExternalDataManager const&) = delete; diff --git a/sw/source/core/inc/DocumentFieldsManager.hxx b/sw/source/core/inc/DocumentFieldsManager.hxx index 493d91acdd03..db87948213db 100644 --- a/sw/source/core/inc/DocumentFieldsManager.hxx +++ b/sw/source/core/inc/DocumentFieldsManager.hxx @@ -28,7 +28,7 @@ class SwDBNameInfField; namespace sw { -class DocumentFieldsManager : public IDocumentFieldsAccess +class DocumentFieldsManager final : public IDocumentFieldsAccess { public: diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx index c9813dbf819a..8db5cbe328fe 100644 --- a/sw/source/core/inc/DocumentLayoutManager.hxx +++ b/sw/source/core/inc/DocumentLayoutManager.hxx @@ -29,7 +29,7 @@ class SwLayouter; namespace sw { -class DocumentLayoutManager : public IDocumentLayoutAccess +class DocumentLayoutManager final : public IDocumentLayoutAccess { public: diff --git a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx index 8223591d36f6..7afae81ca880 100644 --- a/sw/source/core/inc/DocumentLinksAdministrationManager.hxx +++ b/sw/source/core/inc/DocumentLinksAdministrationManager.hxx @@ -32,7 +32,7 @@ class SwNodeRange; namespace sw { -class DocumentLinksAdministrationManager : public IDocumentLinksAdministration +class DocumentLinksAdministrationManager final : public IDocumentLinksAdministration { public: diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index 7508a2b5df41..eb31e4e25a66 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -27,7 +27,7 @@ namespace sw { -class DocumentListItemsManager : public IDocumentListItems +class DocumentListItemsManager final : public IDocumentListItems { public: diff --git a/sw/source/core/inc/DocumentListsManager.hxx b/sw/source/core/inc/DocumentListsManager.hxx index 2ba7ececfd9a..c81e40ddeb74 100644 --- a/sw/source/core/inc/DocumentListsManager.hxx +++ b/sw/source/core/inc/DocumentListsManager.hxx @@ -31,7 +31,7 @@ namespace sw { -class DocumentListsManager : public IDocumentListsAccess +class DocumentListsManager final : public IDocumentListsAccess { public: diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx index 97cc231313d2..2489d2397212 100644 --- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx +++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx @@ -27,7 +27,7 @@ class SwDoc; namespace sw { -class DocumentOutlineNodesManager : public IDocumentOutlineNodes +class DocumentOutlineNodesManager final : public IDocumentOutlineNodes { public: diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index 1dbbc16afebb..17ea950700ce 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -24,7 +24,7 @@ class SwDoc; typedef struct _xmlTextWriter* xmlTextWriterPtr; namespace sw { -class DocumentSettingManager : +class DocumentSettingManager final : public IDocumentSettingAccess { std::shared_ptr<SvxForbiddenCharactersTable> mxForbiddenCharsTable; diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx index 5030a4783976..60c8c4923cdc 100644 --- a/sw/source/core/inc/DocumentStateManager.hxx +++ b/sw/source/core/inc/DocumentStateManager.hxx @@ -26,7 +26,7 @@ class SwDoc; namespace sw { -class DocumentStateManager : public IDocumentState +class DocumentStateManager final : public IDocumentState { public: diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index b74d530cd51c..430fcff7ca22 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -29,7 +29,7 @@ struct SwDocStat; namespace sw { -class DocumentStatisticsManager : public IDocumentStatistics +class DocumentStatisticsManager final : public IDocumentStatistics { public: DocumentStatisticsManager(SwDoc& i_rSwdoc); diff --git a/sw/source/core/inc/DocumentStylePoolManager.hxx b/sw/source/core/inc/DocumentStylePoolManager.hxx index 721ecba22c1e..f410d0d092cb 100644 --- a/sw/source/core/inc/DocumentStylePoolManager.hxx +++ b/sw/source/core/inc/DocumentStylePoolManager.hxx @@ -26,7 +26,7 @@ class SwDoc; namespace sw { -class DocumentStylePoolManager : public IDocumentStylePoolAccess +class DocumentStylePoolManager final : public IDocumentStylePoolAccess { public: diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx index 0ac1c1206322..895aa4b86b15 100644 --- a/sw/source/core/inc/DocumentTimerManager.hxx +++ b/sw/source/core/inc/DocumentTimerManager.hxx @@ -30,7 +30,7 @@ class SwDoc; namespace sw { -class DocumentTimerManager : public IDocumentTimerAccess +class DocumentTimerManager final : public IDocumentTimerAccess { public: enum class IdleJob diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index a25e414f8aa2..1bbce7d19c21 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -32,7 +32,7 @@ namespace sw::mark { class FieldmarkWithDropDownButton; - class MarkManager + class MarkManager final : virtual public IDocumentMarkAccess { public: diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx index 69375aa9644a..86f0b55bd5c4 100644 --- a/sw/source/core/inc/SwGrammarMarkUp.hxx +++ b/sw/source/core/inc/SwGrammarMarkUp.hxx @@ -33,7 +33,7 @@ "MarkUpList" would be a better name than WrongList. */ -class SwGrammarMarkUp : public SwWrongList +class SwGrammarMarkUp final : public SwWrongList { std::vector<sal_Int32> maSentence; diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx index 920ad72e3556..d9db25cbd9c0 100644 --- a/sw/source/core/inc/SwXMLBlockExport.hxx +++ b/sw/source/core/inc/SwXMLBlockExport.hxx @@ -23,7 +23,7 @@ class SwXMLTextBlocks; -class SwXMLBlockListExport : public SvXMLExport +class SwXMLBlockListExport final : public SvXMLExport { private: SwXMLTextBlocks &m_rBlockList; diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index 79b16b0791f7..468315708cca 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -30,12 +30,11 @@ using namespace css::xml::sax; using namespace xmloff::token; class SwXMLTextBlocks; -class SwXMLBlockListImport : public SvXMLImport +class SwXMLBlockListImport final : public SvXMLImport { private: SwXMLTextBlocks &m_rBlockList; -protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, @@ -54,9 +53,8 @@ public: throw() override; }; -class SwXMLTextBlockImport : public SvXMLImport +class SwXMLTextBlockImport final : public SvXMLImport { -protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, @@ -83,7 +81,7 @@ enum SwXMLTextBlockToken : sal_Int32 TEXT_P = FastToken::NAMESPACE | XML_NAMESPACE_TEXT | XML_P }; -class SwXMLTextBlockTokenHandler : +class SwXMLTextBlockTokenHandler final : public sax_fastparser::FastTokenHandlerBase { public: @@ -109,7 +107,7 @@ enum SwXMLBlockListToken : sal_Int32 UNFORMATTED_TEXT = FastToken::NAMESPACE | XML_NAMESPACE_BLOCKLIST | XML_UNFORMATTED_TEXT }; -class SwXMLBlockListTokenHandler : +class SwXMLBlockListTokenHandler final : public sax_fastparser::FastTokenHandlerBase { public: diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index b97698efdfd7..0acab2a7d257 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -27,7 +27,7 @@ class SwDoc; class SfxItemPropertySet; -class SwXTextDefaults : public cppu::WeakImplHelper +class SwXTextDefaults final : public cppu::WeakImplHelper < css::beans::XPropertyState, css::beans::XPropertySet, diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index e229ce1f2483..f8c9c765ec41 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -45,7 +45,7 @@ public: }; -class SwAutoCorrDoc : public SvxAutoCorrDoc +class SwAutoCorrDoc final : public SvxAutoCorrDoc { SwEditShell& m_rEditSh; SwPaM& m_rCursor; diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx index 9e650c0ecda9..a807c36e01af 100644 --- a/sw/source/core/inc/annotationmark.hxx +++ b/sw/source/core/inc/annotationmark.hxx @@ -27,7 +27,7 @@ class SwFormatField; namespace sw::mark { - class AnnotationMark : public MarkBase + class AnnotationMark final : public MarkBase { public: AnnotationMark( diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index 6bafb73d1e6a..34f42e3643a6 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -55,7 +55,7 @@ namespace sw }; namespace objectpositioning { - class SwAsCharAnchoredObjectPosition : public SwAnchoredObjectPosition + class SwAsCharAnchoredObjectPosition final : public SwAnchoredObjectPosition { private: // data to calculate object position diff --git a/sw/source/core/inc/attrhint.hxx b/sw/source/core/inc/attrhint.hxx index 8a3e86c5fd13..e098b2695244 100644 --- a/sw/source/core/inc/attrhint.hxx +++ b/sw/source/core/inc/attrhint.hxx @@ -22,7 +22,7 @@ #include <svl/hint.hxx> -class SwAttrHint : public SfxHint +class SwAttrHint final : public SfxHint { }; diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx index e2e1125ffd07..b481897f03f4 100644 --- a/sw/source/core/inc/colfrm.hxx +++ b/sw/source/core/inc/colfrm.hxx @@ -22,7 +22,7 @@ #include "ftnboss.hxx" -class SwColumnFrame : public SwFootnoteBossFrame +class SwColumnFrame final : public SwFootnoteBossFrame { private: virtual void DestroyImpl() override; diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx index fa364a9b8742..70ebba4284f9 100644 --- a/sw/source/core/inc/crossrefbookmark.hxx +++ b/sw/source/core/inc/crossrefbookmark.hxx @@ -62,7 +62,7 @@ namespace sw::mark { } }; - class CrossRefHeadingBookmark + class CrossRefHeadingBookmark final : public CrossRefBookmark { public: @@ -72,7 +72,7 @@ namespace sw::mark { static bool IsLegalName(const OUString& rName); }; - class CrossRefNumItemBookmark + class CrossRefNumItemBookmark final : public CrossRefBookmark { public: diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 55d87f674c81..11df846f0dc1 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -29,13 +29,12 @@ class SwFlyFrame; class SwFrameFormat; // DrawObjects for Flys -class SwFlyDrawObj : public SdrObject +class SwFlyDrawObj final : public SdrObject { private: virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; bool mbIsTextBox; -protected: // #i95264# SwFlyDrawObj needs an own VC since createViewIndependentPrimitive2DSequence() // is called when RecalcBoundRect() is used virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; @@ -56,7 +55,7 @@ public: // virtual objects for Flys // Flys will always be shown with virtual objects. By doing that, they can be // shown multiple times if needed (header/footer). -class SwVirtFlyDrawObj : public SdrVirtObj +class SwVirtFlyDrawObj final : public SdrVirtObj { private: SwFlyFrame *m_pFlyFrame; @@ -65,7 +64,6 @@ private: // of a GraphicFrame Degree10 getPossibleRotationFromFraphicFrame(Size& rSize) const; -protected: // AW: Need own sdr::contact::ViewContact since AnchorPos from parent is // not used but something own (top left of new SnapRect minus top left // of original SnapRect) diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index 93d68cb01ec9..e68227a21a4e 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -106,13 +106,13 @@ class SetGetExpFields : public o3tl::sorted_vector<std::unique_ptr<SetGetExpFiel }; // struct for saving strings from the SetExp's string fields -struct HashStr : public SwHash +struct HashStr final : public SwHash { OUString aSetStr; HashStr( const OUString& rName, const OUString& rText, HashStr* ); }; -struct SwCalcFieldType : public SwHash +struct SwCalcFieldType final : public SwHash { const SwFieldType* pFieldType; diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 7a89c4c716b9..f18775b3c7a5 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -88,7 +88,7 @@ private: }; // sort text -struct SwSortTextElement : public SwSortElement +struct SwSortTextElement final : public SwSortElement { sal_uLong nOrg; SwNodeIndex aPos; @@ -99,7 +99,7 @@ struct SwSortTextElement : public SwSortElement }; // sort table -struct SwSortBoxElement : public SwSortElement +struct SwSortBoxElement final : public SwSortElement { sal_uInt16 nRow; diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx index 2e1bcd60ca8e..f71970f89130 100644 --- a/sw/source/core/inc/fieldhint.hxx +++ b/sw/source/core/inc/fieldhint.hxx @@ -25,7 +25,7 @@ class SwPaM; class SwRootFrame; -class SwFieldHint : public SfxHint +class SwFieldHint final : public SfxHint { public: SwPaM* m_pPaM; diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 04a8376d9430..b1cccfd2af4d 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -416,11 +416,10 @@ public: bool JoinedWithNext( const SwFrame& _rFrame ) const; }; -class SwBorderAttrAccess : public SwCacheAccess +class SwBorderAttrAccess final : public SwCacheAccess { const SwFrame *m_pConstructor; //opt: for passing on to SwBorderAttrs -protected: virtual SwCacheObj *NewObj() override; public: diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index 34dc89bc146c..e0538e3692bb 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -43,7 +43,7 @@ void RemoveFootnotesForNode( // SwFootnoteContFrame. Each footnote is separated by a SwFootnoteFrame which contains // the text frames of a footnote. SwFootnoteFrame can be split and will then // continue on another page. -class SwFootnoteContFrame: public SwLayoutFrame +class SwFootnoteContFrame final : public SwLayoutFrame { static SwFootnoteFrame* AddChained(bool bAppend, SwFrame *pNewUpper, bool bDefaultFormat); diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index 7d070b6831f7..310e57d7e0c0 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -40,14 +40,14 @@ public: }; /// Header in the document layout, inside a page. -class SwHeaderFrame: public SwHeadFootFrame +class SwHeaderFrame final : public SwHeadFootFrame { public: SwHeaderFrame( SwFrameFormat* pFrame, SwFrame* pSib ) : SwHeadFootFrame(pFrame, pSib, SwFrameType::Header) {}; }; /// Footer in the document layout, inside a page. -class SwFooterFrame: public SwHeadFootFrame +class SwFooterFrame final : public SwHeadFootFrame { public: SwFooterFrame( SwFrameFormat* pFrame, SwFrame* pSib ) : SwHeadFootFrame(pFrame, pSib, SwFrameType::Footer) {}; diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx index 4e67a5479561..e6af4c132a48 100644 --- a/sw/source/core/inc/notxtfrm.hxx +++ b/sw/source/core/inc/notxtfrm.hxx @@ -29,7 +29,7 @@ class OutputDevice; class SwBorderAttrs; struct SwCursorMoveState; -class SwNoTextFrame: public SwContentFrame +class SwNoTextFrame final : public SwContentFrame { private: friend void FrameFinit(); @@ -57,7 +57,6 @@ private: sdr::contact::ViewContact& GetViewContact() const; void OnGraphicArrived(); -protected: virtual void MakeAll(vcl::RenderContext* pRenderContext) override; virtual void SwClientNotify(const SwModify&, const SfxHint&) override; diff --git a/sw/source/core/inc/pagedeschint.hxx b/sw/source/core/inc/pagedeschint.hxx index adee2319f2be..2dbfec18dabe 100644 --- a/sw/source/core/inc/pagedeschint.hxx +++ b/sw/source/core/inc/pagedeschint.hxx @@ -24,7 +24,7 @@ class SwPageDesc; -class SwPageDescHint : public SfxHint +class SwPageDescHint final : public SfxHint { SwPageDesc* m_pPageDesc; public: diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index 579efb24f487..5f8f3df3b9b9 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -28,7 +28,7 @@ OD 2007-01-29 #i73788# */ -class SwAsyncRetrieveInputStreamThread : public ObservableThread +class SwAsyncRetrieveInputStreamThread final : public ObservableThread { public: @@ -38,12 +38,10 @@ class SwAsyncRetrieveInputStreamThread : public ObservableThread virtual ~SwAsyncRetrieveInputStreamThread() override; - protected: + private: virtual void threadFunction() override; - private: - SwAsyncRetrieveInputStreamThread( const SwRetrievedInputStreamDataManager::tDataKey nDataKey, const OUString& rLinkedURL, const OUString& rReferer ); diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index a67f0ea692e4..bc70e036fd43 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -89,7 +89,7 @@ public: virtual void dumpAsXml(xmlTextWriterPtr pWriter) const; }; -class SwHistorySetFormat : public SwHistoryHint +class SwHistorySetFormat final : public SwHistoryHint { std::unique_ptr<SfxPoolItem> m_pAttr; const sal_uLong m_nNodeIndex; @@ -103,7 +103,7 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -class SwHistoryResetFormat : public SwHistoryHint +class SwHistoryResetFormat final : public SwHistoryHint { const sal_uLong m_nNodeIndex; const sal_uInt16 m_nWhich; @@ -114,7 +114,7 @@ public: }; -class SwHistorySetText : public SwHistoryHint +class SwHistorySetText final : public SwHistoryHint { std::unique_ptr<SfxPoolItem> m_pAttr; const sal_uLong m_nNodeIndex; @@ -130,7 +130,7 @@ public: }; -class SwHistorySetTextField : public SwHistoryHint +class SwHistorySetTextField final : public SwHistoryHint { //!! beware of the order for the declaration of the unique_ptrs. //!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well) @@ -150,7 +150,7 @@ public: }; -class SwHistorySetRefMark : public SwHistoryHint +class SwHistorySetRefMark final : public SwHistoryHint { const OUString m_RefName; const sal_uLong m_nNodeIndex; @@ -163,7 +163,7 @@ public: }; -class SwHistorySetTOXMark : public SwHistoryHint +class SwHistorySetTOXMark final : public SwHistoryHint { SwTOXMark m_TOXMark; const OUString m_TOXName; @@ -180,7 +180,7 @@ public: static SwTOXType* GetSwTOXType(SwDoc& rDoc, TOXTypes eTOXTypes, const OUString& rTOXName); }; -class SwHistoryResetText : public SwHistoryHint +class SwHistoryResetText final : public SwHistoryHint { const sal_uLong m_nNodeIndex; const sal_Int32 m_nStart; @@ -198,7 +198,7 @@ public: }; -class SwHistorySetFootnote : public SwHistoryHint +class SwHistorySetFootnote final : public SwHistoryHint { const std::unique_ptr<SwUndoSaveSection, o3tl::default_delete<SwUndoSaveSection>> m_pUndo; const OUString m_FootnoteNumber; @@ -216,7 +216,7 @@ public: }; -class SwHistoryChangeFormatColl : public SwHistoryHint +class SwHistoryChangeFormatColl final : public SwHistoryHint { SwFormatColl * const m_pColl; const sal_uLong m_nNodeIndex; @@ -228,7 +228,7 @@ public: }; -class SwHistoryTextFlyCnt : public SwHistoryHint +class SwHistoryTextFlyCnt final : public SwHistoryHint { std::unique_ptr<SwUndoDelLayFormat> m_pUndo; @@ -241,7 +241,7 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; -class SwHistoryBookmark : public SwHistoryHint +class SwHistoryBookmark final : public SwHistoryHint { public: SwHistoryBookmark(const ::sw::mark::IMark& rBkmk, @@ -270,7 +270,7 @@ class SwHistoryBookmark : public SwHistoryHint /// History object containing all information used during undo / redo /// of checkbox and drop-down form field insertion. -class SwHistoryNoTextFieldmark : public SwHistoryHint +class SwHistoryNoTextFieldmark final : public SwHistoryHint { public: SwHistoryNoTextFieldmark(const ::sw::mark::IFieldmark& rFieldMark); @@ -285,7 +285,7 @@ class SwHistoryNoTextFieldmark : public SwHistoryHint /// History object containing all information used during undo / redo /// of text form field insertion. -class SwHistoryTextFieldmark : public SwHistoryHint +class SwHistoryTextFieldmark final : public SwHistoryHint { public: SwHistoryTextFieldmark(const ::sw::mark::IFieldmark& rFieldMark); @@ -303,7 +303,7 @@ class SwHistoryTextFieldmark : public SwHistoryHint /*const*/ sal_Int32 m_nSepContent; }; -class SwHistorySetAttrSet : public SwHistoryHint +class SwHistorySetAttrSet final : public SwHistoryHint { SfxItemSet m_OldSet; std::vector<sal_uInt16> m_ResetArray; @@ -316,7 +316,7 @@ public: }; -class SwHistoryChangeFlyAnchor : public SwHistoryHint +class SwHistoryChangeFlyAnchor final : public SwHistoryHint { SwFrameFormat & m_rFormat; const sal_uLong m_nOldNodeIndex; @@ -327,7 +327,7 @@ public: virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; -class SwHistoryChangeFlyChain : public SwHistoryHint +class SwHistoryChangeFlyChain final : public SwHistoryHint { SwFlyFrameFormat * const m_pPrevFormat; SwFlyFrameFormat * const m_pNextFormat; @@ -338,7 +338,7 @@ public: virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override; }; -class SwHistoryChangeCharFormat : public SwHistoryHint +class SwHistoryChangeCharFormat final : public SwHistoryHint { const SfxItemSet m_OldSet; const OUString m_Format; diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index ebe64d841feb..59baaefd94c8 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -42,7 +42,7 @@ public: // AttributSet/Font-Cache, globale Variable, in FontCache.Cxx angelegt extern SwFontCache *pSwFontCache; -class SwFontObj : public SwCacheObj +class SwFontObj final : public SwCacheObj { friend class SwFontAccess; diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index c15f7f1f4b49..59b31a3946a6 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -50,7 +50,7 @@ const sal_Unicode CH_SIX_PER_EM = 0x2006; // six-per-em space Degree10 UnMapDirection( Degree10 nDir, const bool bVertFormat, const bool bVertFormatLRBT ); -class SwSubFont : public SvxFont +class SwSubFont final : public SvxFont { friend class SwFont; const void* m_nFontCacheId; // "MagicNumber" within the font cache diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx index 94bbc0403801..3b8683f557b1 100644 --- a/sw/source/core/inc/textapi.hxx +++ b/sw/source/core/inc/textapi.hxx @@ -47,7 +47,7 @@ public: OUString GetText() const; }; -class SwTextAPIObject : public SvxUnoText +class SwTextAPIObject final : public SvxUnoText { std::unique_ptr<SwTextAPIEditSource> m_pSource; public: diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx index 4917296c6cb9..071de465ccc4 100644 --- a/sw/source/core/inc/threadlistener.hxx +++ b/sw/source/core/inc/threadlistener.hxx @@ -34,7 +34,7 @@ class ObservableThread; - A thread can only have one or none listener. - The notification is performed via the ThreadID */ -class ThreadListener : public IFinishedThreadListener +class ThreadListener final : public IFinishedThreadListener { public: diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 07dd957cdf9c..54fdecc589de 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -27,7 +27,7 @@ class SwRect; namespace objectpositioning { - class SwToContentAnchoredObjectPosition : public SwAnchoredObjectPosition + class SwToContentAnchoredObjectPosition final : public SwAnchoredObjectPosition { private: // calculated data for object position diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index 14bda973e969..256e7378d889 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -22,7 +22,7 @@ namespace objectpositioning { - class SwToLayoutAnchoredObjectPosition : public SwAnchoredObjectPosition + class SwToLayoutAnchoredObjectPosition final : public SwAnchoredObjectPosition { private: // calculated data for object position type TO_LAYOUT diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index b7772a5b1135..dd8cc50412f0 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -187,7 +187,7 @@ inline const css::lang::Locale& SwTOXSortTabBase::GetLocale() const /** * For sorting by text */ -struct SwTOXIndex : public SwTOXSortTabBase +struct SwTOXIndex final : public SwTOXSortTabBase { SwTOXIndex( const SwTextNode&, const SwTextTOXMark*, SwTOIOptions nOptions, sal_uInt8 nKeyLevel, const SwTOXInternational& rIntl, @@ -205,7 +205,7 @@ private: sal_uInt8 nKeyLevel; }; -struct SwTOXCustom : public SwTOXSortTabBase +struct SwTOXCustom final : public SwTOXSortTabBase { SwTOXCustom( const TextAndReading& rKey, sal_uInt16 nLevel, const SwTOXInternational& rIntl, @@ -225,7 +225,7 @@ private: /** * For sorting by position */ -struct SwTOXContent : public SwTOXSortTabBase +struct SwTOXContent final : public SwTOXSortTabBase { SwTOXContent( const SwTextNode&, const SwTextTOXMark*, const SwTOXInternational& rIntl ); @@ -238,7 +238,7 @@ private: }; -struct SwTOXPara : public SwTOXSortTabBase +struct SwTOXPara final : public SwTOXSortTabBase { SwTOXPara(SwContentNode&, SwTOXElement, sal_uInt16 nLevel = FORM_ALPHA_DELIMITER, @@ -263,7 +263,7 @@ private: OUString m_sSequenceName; }; -struct SwTOXTable : public SwTOXSortTabBase +struct SwTOXTable final : public SwTOXSortTabBase { SwTOXTable( const SwContentNode& rNd ); @@ -278,7 +278,7 @@ private: sal_uInt16 nLevel; }; -struct SwTOXAuthority : public SwTOXSortTabBase +struct SwTOXAuthority final : public SwTOXSortTabBase { private: SwFormatField& m_rField; diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 05de670cff09..eb0e0c27b603 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -147,7 +147,7 @@ public: }; -class SwXFieldmarkParameters +class SwXFieldmarkParameters final : public ::cppu::WeakImplHelper< css::container::XNameContainer> , public SvtListener { diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx index de6b745e36ad..b60418af9994 100644 --- a/sw/source/core/inc/unoevent.hxx +++ b/sw/source/core/inc/unoevent.hxx @@ -32,12 +32,11 @@ namespace sw class ICoreFrameStyle; } -class SwHyperlinkEventDescriptor : public SvDetachedEventDescriptor +class SwHyperlinkEventDescriptor final : public SvDetachedEventDescriptor { //XServiceInfo virtual OUString SAL_CALL getImplementationName() override; -protected: virtual ~SwHyperlinkEventDescriptor() override; public: @@ -55,7 +54,7 @@ public: // 2) SwXGraphicObject // 3) SwXEmbeddedObject // All these objects are an SwXFrame, so they can use a common implementation -class SwFrameEventDescriptor : public SvEventDescriptor +class SwFrameEventDescriptor final : public SvEventDescriptor { SwXFrame& rFrame; @@ -68,13 +67,13 @@ public: virtual OUString SAL_CALL getImplementationName() override; -protected: +private: virtual void setMacroItem(const SvxMacroItem& rItem) override; virtual const SvxMacroItem& getMacroItem() override; virtual sal_uInt16 getMacroItemWhich() const override; }; -class SwFrameStyleEventDescriptor : public SvEventDescriptor +class SwFrameStyleEventDescriptor final : public SvEventDescriptor { sw::ICoreFrameStyle& m_rStyle; @@ -85,7 +84,7 @@ public: virtual OUString SAL_CALL getImplementationName() override; -protected: +private: virtual void setMacroItem(const SvxMacroItem& rItem) override; virtual const SvxMacroItem& getMacroItem() override; virtual sal_uInt16 getMacroItemWhich() const override; diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx index 47f9f0c4dbbb..67960cb74cac 100644 --- a/sw/source/core/inc/unofield.hxx +++ b/sw/source/core/inc/unofield.hxx @@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper , css::lang::XComponent > SwXFieldMaster_Base; -class SwXFieldMaster +class SwXFieldMaster final : public SwXFieldMaster_Base { @@ -120,7 +120,7 @@ typedef ::cppu::WeakImplHelper , css::util::XUpdatable > SwXTextField_Base; -class SwXTextField +class SwXTextField final : public SwXTextField_Base { @@ -209,7 +209,7 @@ typedef ::cppu::WeakImplHelper , css::lang::XServiceInfo > SwXFieldEnumeration_Base; -class SwXFieldEnumeration +class SwXFieldEnumeration final : public SwXFieldEnumeration_Base { diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index f35ec6ecc171..86d2a11ca977 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -45,7 +45,7 @@ typedef ::cppu::ImplInheritanceHelper , css::lang::XUnoTunnel > SwXFlatParagraph_Base; -class SwXFlatParagraph +class SwXFlatParagraph final : public SwXFlatParagraph_Base { public: @@ -107,7 +107,7 @@ private: OUString maExpandText; }; -class SwXFlatParagraphIterator: +class SwXFlatParagraphIterator final : public ::cppu::WeakImplHelper < css::text::XFlatParagraphIterator diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx index c87460a3dd69..13619f2b2f1f 100644 --- a/sw/source/core/inc/unoidx.hxx +++ b/sw/source/core/inc/unoidx.hxx @@ -49,7 +49,7 @@ typedef ::cppu::ImplInheritanceHelper , css::text::XDocumentIndex > SwXDocumentIndex_Base; -class SwXDocumentIndex +class SwXDocumentIndex final : public SwXDocumentIndex_Base { @@ -149,7 +149,7 @@ typedef ::cppu::WeakImplHelper , css::text::XDocumentIndexMark > SwXDocumentIndexMark_Base; -class SwXDocumentIndexMark +class SwXDocumentIndexMark final : public SwXDocumentIndexMark_Base { diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 87c351b5dcc4..ea4c3e66836c 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -190,7 +190,7 @@ typedef ::cppu::ImplInheritanceHelper , css::text::XTextField > SwXMetaField_Base; -class SwXMetaField +class SwXMetaField final : public SwXMetaField_Base { diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index 4fc8d98f1e63..f68c55f6d317 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -32,7 +32,7 @@ class SwFrameFormat; namespace sw { - struct FrameClient : public SwClient + struct FrameClient final : public SwClient { FrameClient(sw::BroadcastingModify* pModify) : SwClient(pModify) {}; }; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 7c6ab857eb86..84ed54d0bc86 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -230,7 +230,7 @@ public: { return *m_pUnoCursor; } }; -class SwXTextPortionEnumeration +class SwXTextPortionEnumeration final : public ::cppu::WeakImplHelper < css::container::XEnumeration , css::lang::XServiceInfo @@ -240,7 +240,6 @@ class SwXTextPortionEnumeration TextRangeList_t m_Portions; // contains all portions, filled by ctor sw::UnoCursorPointer m_pUnoCursor; -protected: virtual ~SwXTextPortionEnumeration() override; public: @@ -268,7 +267,7 @@ public: getSupportedServiceNames() override; }; -class SwXRedlinePortion : public SwXTextPortion +class SwXRedlinePortion final : public SwXTextPortion { private: SwRangeRedline const& m_rRedline; diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx index c65b65009f30..94d81dd28055 100644 --- a/sw/source/core/inc/unorefmark.hxx +++ b/sw/source/core/inc/unorefmark.hxx @@ -41,7 +41,7 @@ typedef ::cppu::WeakImplHelper , css::text::XTextContent > SwXReferenceMark_Base; -class SwXReferenceMark +class SwXReferenceMark final : public SwXReferenceMark_Base { diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index 370ed909f512..2b12b7364235 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -47,7 +47,7 @@ typedef ::cppu::ImplInheritanceHelper , css::text::XTextSection > SwXTextSection_Base; -class SwXTextSection +class SwXTextSection final : public SwXTextSection_Base { diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx index bfbded136a66..4475bafdac15 100644 --- a/sw/source/core/inc/unotextmarkup.hxx +++ b/sw/source/core/inc/unotextmarkup.hxx @@ -74,7 +74,7 @@ protected: /** Implementation of the css::container::XStringKeyMap interface */ -class SwXStringKeyMap: +class SwXStringKeyMap final : public ::cppu::WeakImplHelper< css::container::XStringKeyMap> { diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx index 1dbf4208e77e..d6b4c37de8b6 100644 --- a/sw/source/uibase/inc/annotsh.hxx +++ b/sw/source/uibase/inc/annotsh.hxx @@ -25,7 +25,7 @@ #include <unotools/caserotate.hxx> class SwView; -class SwAnnotationShell: public SfxShell +class SwAnnotationShell final : public SfxShell { SwView& rView; RotateTransliteration m_aRotateCase; diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx index 1556c2acc136..47eced7d3a93 100644 --- a/sw/source/uibase/inc/beziersh.hxx +++ b/sw/source/uibase/inc/beziersh.hxx @@ -21,7 +21,7 @@ #include "basesh.hxx" -class SwBezierShell : public SwBaseShell +class SwBezierShell final : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_BEZIERSHELL) diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index fdf808055c9e..d2565cdc6bf3 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -63,7 +63,7 @@ public: virtual ~SwColumnDlg() override; }; -class ColumnValueSet : public ValueSet +class ColumnValueSet final : public ValueSet { public: ColumnValueSet() diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx index b1b31ec03780..eb65042f314d 100644 --- a/sw/source/uibase/inc/conarc.hxx +++ b/sw/source/uibase/inc/conarc.hxx @@ -22,7 +22,7 @@ #include "drawbase.hxx" // draw rectangle -class ConstArc : public SwDrawBase +class ConstArc final : public SwDrawBase { Point m_aStartPoint; sal_uInt16 m_nButtonUpCount; diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx index 4d67a00dd8f2..86bf0061d1d7 100644 --- a/sw/source/uibase/inc/concustomshape.hxx +++ b/sw/source/uibase/inc/concustomshape.hxx @@ -27,7 +27,7 @@ class SdrObject; class SfxRequest; // draw rectangle -class ConstCustomShape : public SwDrawBase +class ConstCustomShape final : public SwDrawBase { OUString aCustomShape; diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx index 1bb113061c29..e0585f262248 100644 --- a/sw/source/uibase/inc/conform.hxx +++ b/sw/source/uibase/inc/conform.hxx @@ -21,7 +21,7 @@ #include "drawbase.hxx" #include <svx/svdobjkind.hxx> -class ConstFormControl : public SwDrawBase +class ConstFormControl final : public SwDrawBase { private: SdrObjKind m_eObjKind; diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx index e9250eb39e89..377eb685b69e 100644 --- a/sw/source/uibase/inc/conpoly.hxx +++ b/sw/source/uibase/inc/conpoly.hxx @@ -22,7 +22,7 @@ #include "drawbase.hxx" // base class for all functions -class ConstPolygon : public SwDrawBase +class ConstPolygon final : public SwDrawBase { public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx index 878d99c8031e..cc8d62ef7235 100644 --- a/sw/source/uibase/inc/conrect.hxx +++ b/sw/source/uibase/inc/conrect.hxx @@ -23,7 +23,7 @@ #include "drawbase.hxx" // draw rectangle -class ConstRectangle : public SwDrawBase +class ConstRectangle final : public SwDrawBase { bool bMarquee; bool bCapVertical; diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index e6dad0ad57f0..dfb1350a4424 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -34,7 +34,7 @@ class SwRangeRedline; // helper classes -class SwOutlineContent : public SwContent +class SwOutlineContent final : public SwContent { SwOutlineNodes::size_type nOutlinePos; sal_uInt8 nOutlineLevel; @@ -54,7 +54,7 @@ class SwOutlineContent : public SwContent bool IsMoveable() const {return bIsMoveable;}; }; -class SwRegionContent : public SwContent +class SwRegionContent final : public SwContent { sal_uInt8 nRegionLevel; @@ -69,7 +69,7 @@ class SwRegionContent : public SwContent sal_uInt8 GetRegionLevel() const {return nRegionLevel;} }; -class SwURLFieldContent : public SwContent +class SwURLFieldContent final : public SwContent { OUString sURL; const SwTextINetFormat* pINetAttr; @@ -88,7 +88,7 @@ public: const SwTextINetFormat* GetINetAttr() const { return pINetAttr; } }; -class SwPostItContent : public SwContent +class SwPostItContent final : public SwContent { const SwFormatField* pField; public: @@ -104,7 +104,7 @@ public: virtual bool IsProtect() const override; }; -class SwGraphicContent : public SwContent +class SwGraphicContent final : public SwContent { OUString sLink; public: @@ -116,7 +116,7 @@ public: const OUString& GetLink() const {return sLink;} }; -class SwTOXBaseContent : public SwContent +class SwTOXBaseContent final : public SwContent { const SwTOXBase* pBase; public: diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx index b204a39d996b..ca164e95eb2a 100644 --- a/sw/source/uibase/inc/drawsh.hxx +++ b/sw/source/uibase/inc/drawsh.hxx @@ -25,7 +25,7 @@ class SwDrawBaseShell; -class SwDrawShell: public SwDrawBaseShell +class SwDrawShell final : public SwDrawBaseShell { public: SFX_DECL_INTERFACE(SW_DRAWSHELL) diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx index 47a9fbd448c9..6c04649c445c 100644 --- a/sw/source/uibase/inc/drwtxtsh.hxx +++ b/sw/source/uibase/inc/drwtxtsh.hxx @@ -27,7 +27,7 @@ class SdrView; class SwView; class SwWrtShell; -class SwDrawTextShell: public SfxShell +class SwDrawTextShell final : public SfxShell { SwView &rView; RotateTransliteration m_aRotateCase; diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx index 04fb733026ef..40064e8e698b 100644 --- a/sw/source/uibase/inc/glshell.hxx +++ b/sw/source/uibase/inc/glshell.hxx @@ -20,13 +20,12 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX #include <wdocsh.hxx> -class SwGlosDocShell : public SwDocShell +class SwGlosDocShell final : public SwDocShell { OUString aLongName; OUString aShortName; OUString aGroupName; -protected: virtual bool Save() override; public: @@ -50,13 +49,12 @@ public: { aGroupName = rGroupName; } }; -class SwWebGlosDocShell : public SwWebDocShell +class SwWebGlosDocShell final : public SwWebDocShell { OUString aLongName; OUString aShortName; OUString aGroupName; -protected: virtual bool Save() override; public: diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx index cd2204f82fb7..da13c88b5331 100644 --- a/sw/source/uibase/inc/mediash.hxx +++ b/sw/source/uibase/inc/mediash.hxx @@ -25,7 +25,7 @@ #include "basesh.hxx" #include <shellid.hxx> -class SwMediaShell : public SwBaseShell +class SwMediaShell final : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_MEDIASHELL) diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx index f6c86a41b400..3ee72ff9fe08 100644 --- a/sw/source/uibase/inc/navsh.hxx +++ b/sw/source/uibase/inc/navsh.hxx @@ -15,7 +15,7 @@ #include "basesh.hxx" #include <shellid.hxx> -class SwNavigationShell : public SwBaseShell +class SwNavigationShell final : public SwBaseShell { public: SFX_DECL_INTERFACE(SW_NAVIGATIONSHELL) diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index 316bcf0152a4..b748d5a1052d 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -31,7 +31,7 @@ class SwView; -class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper +class SwXDispatchProviderInterceptor final : public cppu::WeakImplHelper < css::frame::XDispatchProviderInterceptor, css::lang::XEventListener, @@ -95,7 +95,7 @@ struct StatusStruct_Impl css::uno::Reference< css::frame::XStatusListener> xListener; css::util::URL aURL; }; -class SwXDispatch : public cppu::WeakImplHelper +class SwXDispatch final : public cppu::WeakImplHelper < css::frame::XDispatch, css::view::XSelectionChangeListener diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 857155df65a7..12fdd419db7d 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -35,7 +35,7 @@ class SwDoc; css::uno::Reference< css::uno::XInterface > SAL_CALL SwXModule_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & ); -class SwXModule : public cppu::WeakImplHelper +class SwXModule final : public cppu::WeakImplHelper < css::view::XViewSettingsSupplier, css::view::XPrintSettingsSupplier, @@ -46,7 +46,6 @@ class SwXModule : public cppu::WeakImplHelper css::uno::Reference< css::beans::XPropertySet > mxViewSettings; css::uno::Reference< css::beans::XPropertySet > mxPrintSettings; -protected: virtual ~SwXModule() override; public: SwXModule(); diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index b31760d8f9fe..473633defd9e 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -47,7 +47,7 @@ class SdrObject; class SwView; -class SwXTextView : +class SwXTextView final : public css::view::XSelectionSupplier, public css::lang::XServiceInfo, public css::view::XFormLayerAccess, @@ -72,7 +72,6 @@ class SwXTextView : const css::uno::Reference< css::awt::XControlModel > & Model, css::uno::Reference< css::awt::XControl >& xToFill ); -protected: virtual ~SwXTextView() override; public: SwXTextView(SwView* pSwView); diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx index 0181c2cd4810..a29e0f940442 100644 --- a/sw/source/uibase/inc/wformsh.hxx +++ b/sw/source/uibase/inc/wformsh.hxx @@ -21,7 +21,7 @@ #include "drformsh.hxx" -class SwWebDrawFormShell : public SwDrawFormShell +class SwWebDrawFormShell final : public SwDrawFormShell { public: SwWebDrawFormShell(SwView& rShell); diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx index e03a49a635e8..de87c87436d7 100644 --- a/sw/source/uibase/inc/wfrmsh.hxx +++ b/sw/source/uibase/inc/wfrmsh.hxx @@ -22,7 +22,7 @@ #include "frmsh.hxx" -class SwWebFrameShell : public SwFrameShell +class SwWebFrameShell final : public SwFrameShell { public: SFX_DECL_INTERFACE(SW_WEBFRAMESHELL) diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx index 645694628eec..937556a6b991 100644 --- a/sw/source/uibase/inc/wgrfsh.hxx +++ b/sw/source/uibase/inc/wgrfsh.hxx @@ -21,7 +21,7 @@ #include "grfsh.hxx" -class SwWebGrfShell : public SwGrfShell +class SwWebGrfShell final : public SwGrfShell { public: SwWebGrfShell(SwView& rShell); diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx index de6e8d5c28a3..556ebb8fd709 100644 --- a/sw/source/uibase/inc/wlistsh.hxx +++ b/sw/source/uibase/inc/wlistsh.hxx @@ -21,7 +21,7 @@ #include "listsh.hxx" -class SwWebListShell : public SwListShell +class SwWebListShell final : public SwListShell { public: SFX_DECL_INTERFACE(SW_WEBLISTSHELL) diff --git a/sw/source/uibase/inc/wolesh.hxx b/sw/source/uibase/inc/wolesh.hxx index 90c51257a206..497c952c7239 100644 --- a/sw/source/uibase/inc/wolesh.hxx +++ b/sw/source/uibase/inc/wolesh.hxx @@ -21,7 +21,7 @@ #include "olesh.hxx" -class SwWebOleShell : public SwOleShell +class SwWebOleShell final : public SwOleShell { public: SFX_DECL_INTERFACE(SW_WEBOLESHELL) diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx index 1ca796e4e2ab..9eff4052d09e 100644 --- a/sw/source/uibase/inc/wtabsh.hxx +++ b/sw/source/uibase/inc/wtabsh.hxx @@ -21,7 +21,7 @@ #include "tabsh.hxx" -class SwWebTableShell : public SwTableShell +class SwWebTableShell final : public SwTableShell { public: SFX_DECL_INTERFACE(SW_WEBTABSHELL) diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx index c8cd3c756638..7958d688f889 100644 --- a/sw/source/uibase/inc/wtextsh.hxx +++ b/sw/source/uibase/inc/wtextsh.hxx @@ -20,7 +20,7 @@ #include "textsh.hxx" -class SwWebTextShell : public SwTextShell +class SwWebTextShell final : public SwTextShell { public: SFX_DECL_INTERFACE(SW_WEBTEXTSHELL) diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx index 94c41551b600..1aa807b2ff21 100644 --- a/sw/source/uibase/inc/wview.hxx +++ b/sw/source/uibase/inc/wview.hxx @@ -22,9 +22,9 @@ #include <swdllapi.h> #include <view.hxx> -class SW_DLLPUBLIC SwWebView : public SwView +class SW_DLLPUBLIC SwWebView final : public SwView { -protected: +private: virtual void SelectShell() override; public: |