diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-17 15:02:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-18 09:12:57 +0200 |
| commit | 4968b6484707cb40b70a3115084e19433d1fec7f (patch) | |
| tree | 58c1926a62f4e7681076e1585e81b875b43cfb6b /sw/source/uibase | |
| parent | a3d89265e0be3f9ee8ae813e4aeaa90af1714348 (diff) | |
loplugin:finalclasses in sw
Change-Id: I5f228e839e0d5a51ece868b55715b04f0affc28d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117397
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
113 files changed, 193 insertions, 216 deletions
diff --git a/sw/source/uibase/inc/DateFormFieldDialog.hxx b/sw/source/uibase/inc/DateFormFieldDialog.hxx index f56626aac2a9..2b4573af7dea 100644 --- a/sw/source/uibase/inc/DateFormFieldDialog.hxx +++ b/sw/source/uibase/inc/DateFormFieldDialog.hxx @@ -23,7 +23,7 @@ class IDateFieldmark; /// Dialog to specify the properties of date form field namespace sw { -class DateFormFieldDialog : public weld::GenericDialogController +class DateFormFieldDialog final : public weld::GenericDialogController { private: sw::mark::IDateFieldmark* m_pDateField; diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 59510d37b751..b8b60f20c293 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -28,7 +28,7 @@ class SwWrtShell; // Dialog to edit drop down field selection namespace sw { -class DropDownFieldDialog : public weld::GenericDialogController +class DropDownFieldDialog final : public weld::GenericDialogController { SwWrtShell &m_rSh; SwDropDownField* m_pDropField; diff --git a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx index 0719b740163a..c6bcc9837304 100644 --- a/sw/source/uibase/inc/DropDownFormFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFormFieldDialog.hxx @@ -20,7 +20,7 @@ class IFieldmark; /// Dialog to specify the properties of drop-down form field namespace sw { -class DropDownFormFieldDialog : public weld::GenericDialogController +class DropDownFormFieldDialog final : public weld::GenericDialogController { private: mark::IFieldmark* m_pDropDownField; diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 5b83bbc79548..95dcbd243d55 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -32,7 +32,7 @@ public: This control is showing the header / footer style name and provides a few useful actions to the user. */ -class SwHeaderFooterWin : public SwFrameMenuButtonBase +class SwHeaderFooterWin final : public SwFrameMenuButtonBase { std::unique_ptr<weld::MenuButton> m_xMenuButton; std::unique_ptr<weld::Button> m_xPushButton; diff --git a/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx b/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx index 36f096ae3df4..a03c3c1f1e2c 100644 --- a/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx +++ b/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx @@ -19,7 +19,7 @@ enum class ButtonSymbol NONE }; -class SwOutlineContentVisibilityWin : public InterimItemWindow, public ISwFrameControl +class SwOutlineContentVisibilityWin final : public InterimItemWindow, public ISwFrameControl { private: std::unique_ptr<weld::Button> m_xShowBtn; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 761a983eeb8b..53d2eec4c1a9 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -22,7 +22,7 @@ class SwPageFrame; This control shows a line indicating a manual page break and a button providing a few actions on that page break. */ -class SwPageBreakWin : public SwFrameMenuButtonBase +class SwPageBreakWin final : public SwFrameMenuButtonBase { std::unique_ptr<weld::MenuButton> m_xMenuButton; VclPtr<vcl::Window> m_pLine; diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index 82cd29204457..8599256da21c 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -25,7 +25,7 @@ class SwWrtShell; struct SpellState; -class SwSpellDialogChildWindow +class SwSpellDialogChildWindow final : public svx::SpellDialogChildWindow { bool m_bIsGrammarCheckingOn; @@ -37,7 +37,6 @@ class SwSpellDialogChildWindow bool SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPortions& rPortions); void LockFocusNotification(bool bLock); -protected: virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck) override; virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck) override; virtual void AddAutoCorrection(const OUString& rOld, const OUString& rNew, LanguageType eLanguage) override; diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx index e9e036b5f193..ce1f991465ba 100644 --- a/sw/source/uibase/inc/SwXFilterOptions.hxx +++ b/sw/source/uibase/inc/SwXFilterOptions.hxx @@ -30,7 +30,7 @@ namespace com::sun::star::io { class XInputStream; } -class SwXFilterOptions : public ::cppu::WeakImplHelper< +class SwXFilterOptions final : public ::cppu::WeakImplHelper< css::beans::XPropertyAccess, css::ui::dialogs::XExecutableDialog, css::document::XImporter, diff --git a/sw/source/uibase/inc/UnfloatTableButton.hxx b/sw/source/uibase/inc/UnfloatTableButton.hxx index 99598bcc2a15..164b240f28b1 100644 --- a/sw/source/uibase/inc/UnfloatTableButton.hxx +++ b/sw/source/uibase/inc/UnfloatTableButton.hxx @@ -22,7 +22,7 @@ * floating properties. * */ -class UnfloatTableButton : public SwFrameMenuButtonBase +class UnfloatTableButton final : public SwFrameMenuButtonBase { std::unique_ptr<weld::Button> m_xPushButton; OUString m_sLabel; diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 3a9e16f9888e..ded62f0ff598 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -20,7 +20,7 @@ #include <sfx2/basedlgs.hxx> -class SwInsertAbstractDlg : public SfxDialogController +class SwInsertAbstractDlg final : public SfxDialogController { std::unique_ptr<weld::SpinButton> m_xLevelNF; std::unique_ptr<weld::SpinButton> m_xParaNF; diff --git a/sw/source/uibase/inc/addrdlg.hxx b/sw/source/uibase/inc/addrdlg.hxx index feb839afdd51..66706915aa6c 100644 --- a/sw/source/uibase/inc/addrdlg.hxx +++ b/sw/source/uibase/inc/addrdlg.hxx @@ -21,7 +21,7 @@ #include <sfx2/basedlgs.hxx> -class SwAddrDlg : public SfxSingleTabDialogController +class SwAddrDlg final : public SfxSingleTabDialogController { public: SwAddrDlg(weld::Window* pParent, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index fc652fab3da3..f62e6574f2c8 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -28,7 +28,7 @@ class SwAsciiOptions; class SvStream; class SwDocShell; -class SwAsciiFilterDlg : public SfxDialogController +class SwAsciiFilterDlg final : public SfxDialogController { bool m_bSaveLineStatus; OUString m_sExtraData; diff --git a/sw/source/uibase/inc/autoformatpreview.hxx b/sw/source/uibase/inc/autoformatpreview.hxx index 8617e35e02f8..f9825bc91951 100644 --- a/sw/source/uibase/inc/autoformatpreview.hxx +++ b/sw/source/uibase/inc/autoformatpreview.hxx @@ -31,7 +31,7 @@ #include "wrtsh.hxx" #include <tblafmt.hxx> -class AutoFormatPreview : public weld::CustomWidgetController +class AutoFormatPreview final : public weld::CustomWidgetController { public: AutoFormatPreview(); diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx index a980cbc064e9..f194c431ccd0 100644 --- a/sw/source/uibase/inc/barcfg.hxx +++ b/sw/source/uibase/inc/barcfg.hxx @@ -24,7 +24,7 @@ enum class SelectionType : sal_Int32; -class SwToolbarConfigItem : public utl::ConfigItem +class SwToolbarConfigItem final : public utl::ConfigItem { sal_Int32 aTbxIdArray[5]; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index 46d9544b7cbd..20d31100b83b 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -25,7 +25,7 @@ #include <vcl/graph.hxx> // extended page for graphics -class BmpWindow : public weld::CustomWidgetController +class BmpWindow final : public weld::CustomWidgetController { private: Graphic aGraphic; diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx index f87395e516a3..d35252ceac4c 100644 --- a/sw/source/uibase/inc/bookctrl.hxx +++ b/sw/source/uibase/inc/bookctrl.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <sfx2/stbitem.hxx> -class SwBookmarkControl : public SfxStatusBarControl +class SwBookmarkControl final : public SfxStatusBarControl { virtual void Command(const CommandEvent& rCEvt) override; diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 2c3b81ffe69e..6441a5f16f63 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -60,7 +60,7 @@ public: static const char cSeparator; }; -class SwInsertBookmarkDlg : public SfxDialogController +class SwInsertBookmarkDlg final : public SfxDialogController { SwWrtShell& rSh; std::vector<std::pair<sw::mark::IMark*, OUString>> aTableBookmarks; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 8b021d0d6d1a..928761305027 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -25,7 +25,7 @@ class SwWrtShell; -class SwBreakDlg : public weld::GenericDialogController +class SwBreakDlg final : public weld::GenericDialogController { std::unique_ptr<weld::RadioButton> m_xLineBtn; std::unique_ptr<weld::RadioButton> m_xColumnBtn; diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 0aa6c2c8d135..34ffa2d24e12 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -38,7 +38,7 @@ class SwShdwCursorOptionsTabPage; enum class SwFillMode; /// Item for settings dialog - document view -class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem +class SW_DLLPUBLIC SwDocDisplayItem final : public SfxPoolItem { friend class SwShdwCursorOptionsTabPage; friend class SwModule; @@ -64,7 +64,7 @@ public: // OS 12.01.95 // Item for settings dialog, element page -class SW_DLLPUBLIC SwElemItem : public SfxPoolItem +class SW_DLLPUBLIC SwElemItem final : public SfxPoolItem { //view bool m_bVertRuler :1; @@ -99,7 +99,7 @@ public: // OS 12.01.95 // Item for settings dialog - printer/add-ons -class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData +class SW_DLLPUBLIC SwAddPrinterItem final : public SfxPoolItem, public SwPrintData { using SwPrintData::operator ==; @@ -113,7 +113,7 @@ public: }; /// Item for settings dialog, ShadowCursorPage -class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem +class SW_DLLPUBLIC SwShadowCursorItem final : public SfxPoolItem { SwFillMode m_eMode; bool m_bOn; @@ -136,7 +136,7 @@ public: #ifdef DBG_UTIL // Item for settings dialog - test settings -class SW_DLLPUBLIC SwTestItem : public SfxPoolItem +class SW_DLLPUBLIC SwTestItem final : public SfxPoolItem { friend class SwModule; friend class SwTestTabPage; diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index a56144bd995d..a928a5d3074f 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -28,7 +28,7 @@ class SwWrtShell; struct SwDBData; // exchange database at fields -class SwChangeDBDlg : public SfxDialogController +class SwChangeDBDlg final : public SfxDialogController { SwWrtShell *pSh; diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 09138b5ccb51..8527f15e2693 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -25,7 +25,7 @@ class SwView; class SvxMacroItem; -class SwCharDlg : public SfxTabDialogController +class SwCharDlg final : public SfxTabDialogController { SwView& m_rView; SwCharDlgMode m_nDialogMode; @@ -39,7 +39,7 @@ public: virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; }; -class SwCharURLPage : public SfxTabPage +class SwCharURLPage final : public SfxTabPage { std::unique_ptr<SvxMacroItem> pINetItem; bool bModified; diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 41f7e4143a71..07c007465da2 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -42,10 +42,10 @@ public: void UpdateExample( const SfxItemSet& rSet ); }; -class SW_DLLPUBLIC SwPageGridExample : public SwPageExample +class SW_DLLPUBLIC SwPageGridExample final : public SwPageExample { std::unique_ptr<SwTextGridItem> pGridItem; -protected: + virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, @@ -57,13 +57,12 @@ public: }; -class SW_DLLPUBLIC SwColExample : public SwPageExample +class SW_DLLPUBLIC SwColExample final : public SwPageExample { SwColMgr* pColMgr; using SwPageExample::UpdateExample; -protected: virtual void DrawPage(vcl::RenderContext& rRenderContext, const Point& rPoint, const bool bSecond, @@ -82,7 +81,7 @@ public: } }; -class SW_DLLPUBLIC SwColumnOnlyExample : public weld::CustomWidgetController +class SW_DLLPUBLIC SwColumnOnlyExample final : public weld::CustomWidgetController { private: Size m_aWinSize; @@ -90,7 +89,6 @@ private: Size m_aFrameSize; SwFormatCol m_aCols; -protected: virtual void Resize() override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index e7c39cb7db90..133757a77d52 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -33,7 +33,7 @@ class SwColMgr; class SwWrtShell; class SwColumnPage; -class SwColumnDlg : public SfxDialogController +class SwColumnDlg final : public SfxDialogController { SwWrtShell& m_rWrtShell; std::unique_ptr<SwColumnPage> m_xTabPage; @@ -81,7 +81,7 @@ public: }; // column dialog now as TabPage -class SwColumnPage : public SfxTabPage +class SwColumnPage final : public SfxTabPage { std::unique_ptr<SwColMgr> m_xColMgr; diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index 1c4df0086b55..a4599508c000 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -25,7 +25,7 @@ class ConditionEdit; -class SW_DLLPUBLIC ConditionEditDropTarget : public DropTargetHelper +class SW_DLLPUBLIC ConditionEditDropTarget final : public DropTargetHelper { private: ConditionEdit& m_rEdit; diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index 69f9696158ee..64b1e265f10b 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -152,7 +152,7 @@ public: * GetMember. It is reloaded after Invalidate() only if the content * should be read again. */ -class SwContentType : public SwTypeNumber +class SwContentType final : public SwTypeNumber { SwWrtShell* m_pWrtShell; std::unique_ptr<SwContentArr> @@ -166,7 +166,7 @@ class SwContentType : public SwTypeNumber bool m_bDataValid : 1; bool m_bEdit: 1; // can this type be edited? bool m_bDelete: 1; // can this type be deleted? -protected: + static OUString RemoveNewline(const OUString&); public: SwContentType(SwWrtShell* pParent, ContentTypeId nType, sal_uInt8 nLevel ); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index f572bc76a983..4ac942e9ecd7 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -71,7 +71,7 @@ namespace o3tl { class SwContentTree; -class SwContentTreeDropTarget : public DropTargetHelper +class SwContentTreeDropTarget final : public DropTargetHelper { private: SwContentTree& m_rTreeView; @@ -270,7 +270,7 @@ namespace sfx2 { class FileDialogHelper; } class SwGlobalTree; -class SwGlobalTreeDropTarget : public DropTargetHelper +class SwGlobalTreeDropTarget final : public DropTargetHelper { private: SwGlobalTree& m_rTreeView; diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 867ae46ce21a..fabfeca26a53 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -28,7 +28,7 @@ class SwView; class SwWrtShell; struct SwInsertTableOptions; -class SwConvertTableDlg : public SfxDialogController +class SwConvertTableDlg final : public SfxDialogController { std::unique_ptr<weld::RadioButton> m_xTabBtn; std::unique_ptr<weld::RadioButton> m_xSemiBtn; diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index b26a1fb2178f..b442857a44b8 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -29,7 +29,7 @@ class SwFieldMgr; class SwView; -class SwCaptionDialog : public SfxDialogController +class SwCaptionDialog final : public SfxDialogController { OUString m_sNone; TextFilterAutoConvert m_aTextFilter; diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx index 5a611f5d8be0..a21319690a9a 100644 --- a/sw/source/uibase/inc/dbconfig.hxx +++ b/sw/source/uibase/inc/dbconfig.hxx @@ -24,7 +24,7 @@ struct SwDBData; -class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem +class SW_DLLPUBLIC SwDBConfig final : public utl::ConfigItem { private: SAL_DLLPRIVATE static const css::uno::Sequence<OUString>& GetPropertyNames(); diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 3cd7a76a6b26..be1496229f91 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -76,7 +76,7 @@ class SwInsDBColumns : public o3tl::sorted_vector<std::unique_ptr<SwInsDBColumn> { }; -class SwInsertDBColAutoPilot : public SfxDialogController, public utl::ConfigItem +class SwInsertDBColAutoPilot final : public SfxDialogController, public utl::ConfigItem { SwInsDBColumns aDBColumns; const SwDBData aDBData; diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index ea42bb44da13..b58b2abed951 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -23,7 +23,7 @@ #include <swdllapi.h> -class PrintMonitor : public weld::GenericDialogController +class PrintMonitor final : public weld::GenericDialogController { public: std::unique_ptr<weld::Label> m_xDocName; @@ -34,7 +34,7 @@ public: virtual ~PrintMonitor() override; }; -class SW_DLLPUBLIC SaveMonitor : public weld::GenericDialogController +class SW_DLLPUBLIC SaveMonitor final : public weld::GenericDialogController { public: std::unique_ptr<weld::Label> m_xDocName; @@ -45,7 +45,7 @@ public: virtual ~SaveMonitor() override; }; -class CreateMonitor : public weld::GenericDialogController +class CreateMonitor final : public weld::GenericDialogController { public: CreateMonitor(weld::Window* pParent); diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 6e232c85ac63..1719349ab5ef 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -23,7 +23,7 @@ class SwWrtShell; -class SwFootNoteOptionDlg : public SfxTabDialogController +class SwFootNoteOptionDlg final : public SfxTabDialogController { SwWrtShell& rSh; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index bf02a7284b09..d07746a0386a 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -28,7 +28,7 @@ class SwWrtShell; -class SwDropCapsDlg : public SfxSingleTabDialogController +class SwDropCapsDlg final : public SfxSingleTabDialogController { public: SwDropCapsDlg(weld::Window *pParent, const SfxItemSet &rSet); @@ -36,7 +36,7 @@ public: class SwDropCapsPage; -class SwDropCapsPict : public weld::CustomWidgetController +class SwDropCapsPict final : public weld::CustomWidgetController { SwDropCapsPage* mpPage; OUString maText; @@ -107,7 +107,7 @@ public: void DrawPrev(vcl::RenderContext& rRenderContext, const Point& rPt); }; -class SwDropCapsPage : public SfxTabPage +class SwDropCapsPage final : public SfxTabPage { friend class SwDropCapsPict; SwDropCapsPict m_aPict; diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx index e6002e1d6107..4f53feb31006 100644 --- a/sw/source/uibase/inc/dselect.hxx +++ b/sw/source/uibase/inc/dselect.hxx @@ -22,7 +22,7 @@ #include "drawbase.hxx" // draw rectangle -class DrawSelection : public SwDrawBase +class DrawSelection final : public SwDrawBase { public: DrawSelection(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx index b63d6b0a5d15..15c2560b9b00 100644 --- a/sw/source/uibase/inc/envimg.hxx +++ b/sw/source/uibase/inc/envimg.hxx @@ -35,7 +35,7 @@ enum SwEnvAlign ENV_VER_RGHT }; -class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem +class SW_DLLPUBLIC SwEnvItem final : public SfxPoolItem { public: @@ -66,7 +66,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; }; -class SwEnvCfgItem : public utl::ConfigItem +class SwEnvCfgItem final : public utl::ConfigItem { private: SwEnvItem m_aEnvItem; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 00abb7ab2889..49a1d9429578 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -43,7 +43,7 @@ class SwEnvFormatPage; class SwWrtShell; class Printer; -class SwEnvPreview : public weld::CustomWidgetController +class SwEnvPreview final : public weld::CustomWidgetController { private: SwEnvDlg* m_pDialog; @@ -56,7 +56,7 @@ public: void SetDialog(SwEnvDlg* pDialog) { m_pDialog = pDialog; } }; -class SwEnvDlg : public SfxTabDialogController +class SwEnvDlg final : public SfxTabDialogController { friend class SwEnvPage; friend class SwEnvFormatPage; @@ -80,7 +80,7 @@ public: virtual ~SwEnvDlg() override; }; -class SwEnvPage : public SfxTabPage +class SwEnvPage final : public SfxTabPage { SwEnvDlg* m_pDialog; SwWrtShell* m_pSh; diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 9f512ea3f7b8..ecb2ff04abf3 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -27,7 +27,7 @@ class SwView; class SwWrtShell; class SwFieldMgr; -class SwFieldEditDlg : public SfxSingleTabDialogController +class SwFieldEditDlg final : public SfxSingleTabDialogController { SwWrtShell* pSh; std::unique_ptr<weld::Button> m_xPrevBT; diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index f55e84e2c202..b2cd767e41f1 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -30,7 +30,7 @@ class SfxTabPage; class SwChildWinWrapper; struct SfxChildWinInfo; -class SwFieldDlg : public SfxTabDialogController +class SwFieldDlg final : public SfxTabDialogController { SwChildWinWrapper* m_pChildWin; SfxBindings* m_pBindings; diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx index 6532ff7db891..a0d0b9d9dfbc 100644 --- a/sw/source/uibase/inc/fldwrap.hxx +++ b/sw/source/uibase/inc/fldwrap.hxx @@ -26,7 +26,7 @@ #include "chldwrap.hxx" class AbstractSwFieldDlg; -class SwFieldDlgWrapper : public SwChildWinWrapper +class SwFieldDlgWrapper final : public SwChildWinWrapper { ScopedVclPtr<AbstractSwFieldDlg> pDlgInterface; public: @@ -40,7 +40,7 @@ public: }; // field dialog only showing database page to support mail merge -class SwFieldDataOnlyDlgWrapper : public SwChildWinWrapper +class SwFieldDataOnlyDlgWrapper final : public SwChildWinWrapper { ScopedVclPtr<AbstractSwFieldDlg> pDlgInterface; public: diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx index 388f16d81c2b..e752d90f08f6 100644 --- a/sw/source/uibase/inc/fontcfg.hxx +++ b/sw/source/uibase/inc/fontcfg.hxx @@ -52,7 +52,7 @@ #define FONTSIZE_CJK_DEFAULT 210 #define FONTSIZE_OUTLINE 280 -class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem +class SW_DLLPUBLIC SwStdFontConfig final : public utl::ConfigItem { OUString sDefaultFonts[DEF_FONT_COUNT]; sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT]; diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index e3c079a2228f..87f03d8cc97a 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -26,7 +26,7 @@ class SwWrtShell; // frame dialog -class SwFrameDlg : public SfxTabDialogController +class SwFrameDlg final : public SfxTabDialogController { bool m_bFormat; bool m_bNew; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 831ce60933d1..a555440622ad 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -35,7 +35,7 @@ struct FrameMap; struct SwPosition; // frame dialog -class SwFramePage: public SfxTabPage +class SwFramePage final : public SfxTabPage { bool m_bAtHorzPosModified; bool m_bAtVertPosModified; @@ -192,7 +192,7 @@ public: void EnableVerticalPositioning( bool bEnable ); }; -class SwGrfExtPage : public SfxTabPage +class SwGrfExtPage final : public SfxTabPage { OUString aFilterName; OUString aGrfName, aNewGrfName; @@ -240,7 +240,7 @@ public: virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; }; -class SwFrameURLPage : public SfxTabPage +class SwFrameURLPage final : public SfxTabPage { // hyperlink std::unique_ptr<weld::Entry> m_xURLED; @@ -264,7 +264,7 @@ public: virtual void Reset(const SfxItemSet *rSet) override; }; -class SwFrameAddPage : public SfxTabPage +class SwFrameAddPage final : public SfxTabPage { SwWrtShell* m_pWrtSh; diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx index 11192ecd6234..bd6954bfa2ff 100644 --- a/sw/source/uibase/inc/gloslst.hxx +++ b/sw/source/uibase/inc/gloslst.hxx @@ -44,7 +44,7 @@ struct AutoTextGroup } }; -class SwGlossaryList : public AutoTimer +class SwGlossaryList final : public AutoTimer { std::vector<std::unique_ptr<AutoTextGroup>> aGroupArr; OUString sPath; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index 6427f04a5c34..ada07976450f 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -39,7 +39,7 @@ class SwOneExampleFrame; const short RET_EDIT = 100; -class SwGlossaryDlg : public SfxDialogController +class SwGlossaryDlg final : public SfxDialogController { friend class SwNewGlosNameDlg; diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 9b2d26d1216e..acec1b25f163 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -26,7 +26,7 @@ class SwView; -class SW_DLLPUBLIC SwHyphWrapper : public SvxSpellWrapper { +class SW_DLLPUBLIC SwHyphWrapper final : public SvxSpellWrapper { private: SwView* pView; sal_uInt16 nPageCount; // page count for progress view @@ -35,7 +35,6 @@ private: bool bAutomatic : 1; // insert separators without further inquiry bool bInfoBox : 1; // display info-box when ending -protected: virtual void SpellStart( SvxSpellArea eSpell ) override; virtual void SpellContinue() override; virtual void SpellEnd( ) override; diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index f1dfc725dc33..c724e3b76bd6 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -29,7 +29,7 @@ class SwWrtShell; class SwFieldMgr; // insert fields -class SwFieldInputDlg : public weld::GenericDialogController +class SwFieldInputDlg final : public weld::GenericDialogController { void Apply(); diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index f4cd41508572..6f2a47a31a30 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -189,7 +189,7 @@ public: const SwView* GetView() const{return pView;} }; -class SwInputChild : public SfxChildWindow +class SwInputChild final : public SfxChildWindow { SfxDispatcher* pDispatch; public: diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index bf0600bb73aa..396e87404644 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -25,7 +25,7 @@ class SwWrtShell; class VclFrame; -class SwInsFootNoteDlg: public weld::GenericDialogController +class SwInsFootNoteDlg final : public weld::GenericDialogController { SwWrtShell &m_rSh; diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 381b1ba4f39a..cc3fd0204ccb 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -32,7 +32,7 @@ #include <itabenum.hxx> #include <memory> -class SwInsTableDlg : public SfxDialogController +class SwInsTableDlg final : public SfxDialogController { TextFilter m_aTextFilter; diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index b71adfc18348..0b4ca37cab07 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -26,7 +26,7 @@ class SwScriptField; namespace sfx2 { class FileDialogHelper; } -class SwJavaEditDialog : public weld::GenericDialogController +class SwJavaEditDialog final : public weld::GenericDialogController { private: OUString m_aText; diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index a7a1c66412c6..5914423697d1 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -29,7 +29,7 @@ class SwLabPrtPage; class SwDBManager; class Printer; -class SwLabDlg : public SfxTabDialogController +class SwLabDlg final : public SfxTabDialogController { SwLabelConfig aLabelsCfg; SwDBManager* pDBManager; diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx index c206f67de809..2a88d590215e 100644 --- a/sw/source/uibase/inc/labelcfg.hxx +++ b/sw/source/uibase/inc/labelcfg.hxx @@ -32,7 +32,7 @@ struct SwLabelMeasure bool m_bPredefined; // used to distinguish predefined from user-defined labels }; -class SW_DLLPUBLIC SwLabelConfig : public utl::ConfigItem +class SW_DLLPUBLIC SwLabelConfig final : public utl::ConfigItem { private: std::vector<OUString> m_aManufacturers; diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index ec01bf38ffcc..47255d37c078 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -26,7 +26,7 @@ class SwLabCfgItem; -class SW_DLLPUBLIC SwLabItem : public SfxPoolItem +class SW_DLLPUBLIC SwLabItem final : public SfxPoolItem { public: @@ -102,7 +102,7 @@ public: OUString m_sGlossaryBlockName; }; -class SwLabCfgItem : public utl::ConfigItem +class SwLabCfgItem final : public utl::ConfigItem { private: SwLabItem aItem; diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index d239e631992f..eaed16129626 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -25,7 +25,7 @@ class SwView; class SwWrtShell; -class SwLineNumberingDlg : public SfxDialogController +class SwLineNumberingDlg final : public SfxDialogController { private: SwWrtShell* m_pSh; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index e008a702ab46..47c1f8bdaaa5 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -25,7 +25,7 @@ class SwTestAccountSettingsDialog; class SwMailMergeConfigItem; -class SwMailConfigPage : public SfxTabPage +class SwMailConfigPage final : public SfxTabPage { friend class SwTestAccountSettingsDialog; @@ -58,7 +58,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) override; }; -class SwMailConfigDlg : public SfxSingleTabDialogController +class SwMailConfigDlg final : public SfxSingleTabDialogController { public: SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index e6f9f0cc7888..5fd862d36331 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -41,7 +41,8 @@ class IMailDispatcherListener; must not be shared among different client threads. Instead each client thread should create an own instance of this class. */ -class SW_DLLPUBLIC MailDispatcher : public salhelper::SimpleReferenceObject, private ::osl::Thread +class SW_DLLPUBLIC MailDispatcher final : public salhelper::SimpleReferenceObject, + private ::osl::Thread { public: // bringing operator new/delete into scope @@ -130,15 +131,13 @@ public: */ void addListener(::rtl::Reference<IMailDispatcherListener> const& listener); -protected: +private: virtual void SAL_CALL run() override; virtual void SAL_CALL onTerminated() override; -private: std::vector<::rtl::Reference<IMailDispatcherListener>> cloneListener(); void sendMailMessageNotifyListener(css::uno::Reference<css::mail::XMailMessage> const& message); -private: css::uno::Reference<css::mail::XSmtpService> m_xMailserver; std::list<css::uno::Reference<css::mail::XMailMessage>> m_aXMessageList; std::vector<::rtl::Reference<IMailDispatcherListener>> m_aListenerVector; diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 3b476a5245bf..60882df8aba5 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -56,7 +56,7 @@ struct SwAddressPreview_Impl; // Preview window used to show the possible selection of address blocks // and also the resulting address filled with database data -class SW_DLLPUBLIC SwAddressPreview : public weld::CustomWidgetController +class SW_DLLPUBLIC SwAddressPreview final : public weld::CustomWidgetController { std::unique_ptr<SwAddressPreview_Impl> pImpl; std::unique_ptr<weld::ScrolledWindow> m_xVScrollBar; @@ -133,7 +133,7 @@ public: bool HasMore() const { return !sAddress.isEmpty(); } }; -class SW_DLLPUBLIC SwAuthenticator : +class SW_DLLPUBLIC SwAuthenticator final : public cppu::WeakImplHelper<css::mail::XAuthenticator> { OUString m_aUserName; @@ -155,7 +155,7 @@ public: }; -class SW_DLLPUBLIC SwConnectionContext : public cppu::WeakImplHelper<css::uno::XCurrentContext> +class SW_DLLPUBLIC SwConnectionContext final : public cppu::WeakImplHelper<css::uno::XCurrentContext> { OUString m_sMailServer; sal_Int16 m_nPort; @@ -174,7 +174,7 @@ public: osl::Mutex m_aMutex; }; -class SW_DLLPUBLIC SwConnectionListener : +class SW_DLLPUBLIC SwConnectionListener final : public SwMutexBase, public cppu::WeakComponentImplHelper<css::mail::XConnectionListener> { @@ -193,7 +193,7 @@ public: virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override; }; -class SW_DLLPUBLIC SwMailTransferable : +class SW_DLLPUBLIC SwMailTransferable final : public SwMutexBase, public cppu::WeakComponentImplHelper<css::datatransfer::XTransferable, css::beans::XPropertySet> { @@ -228,7 +228,7 @@ class SW_DLLPUBLIC SwMailTransferable : }; -class SW_DLLPUBLIC SwMailMessage : +class SW_DLLPUBLIC SwMailMessage final : public SwMutexBase, public cppu::WeakComponentImplHelper<css::mail::XMailMessage> { diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 0ab3c8dce8aa..657341cf307c 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -34,7 +34,7 @@ using vcl::WizardTypes::CommitPageReason; #define MM_GREETINGSPAGE 3 #define MM_LAYOUTPAGE 4 -class SwMailMergeWizard : public ::vcl::RoadmapWizardMachine +class SwMailMergeWizard final : public ::vcl::RoadmapWizardMachine { SwView* m_pSwView; OUString sDocumentURL; @@ -53,7 +53,6 @@ class SwMailMergeWizard : public ::vcl::RoadmapWizardMachine using vcl::WizardMachine::skipUntil; -protected: virtual std::unique_ptr<BuilderPage> createPage( WizardState _nState ) override; virtual void enterState( WizardState _nState ) override; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 0eebc628618b..c141029e3122 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -41,7 +41,7 @@ namespace com::sun::star{ } } -class SwMailMergeDlg : public SfxDialogController +class SwMailMergeDlg final : public SfxDialogController { friend class SwXSelChgLstnr_Impl; @@ -137,7 +137,7 @@ public: }; -class SwMailMergeCreateFromDlg : public weld::GenericDialogController +class SwMailMergeCreateFromDlg final : public weld::GenericDialogController { std::unique_ptr<weld::RadioButton> m_xThisDocRB; public: @@ -149,7 +149,7 @@ public: } }; -class SwMailMergeFieldConnectionsDlg : public weld::GenericDialogController +class SwMailMergeFieldConnectionsDlg final : public weld::GenericDialogController { std::unique_ptr<weld::RadioButton> m_xUseExistingRB; public: diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 765c3d603947..5b4ef970ef8a 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -21,7 +21,7 @@ #include <vcl/weld.hxx> -class SwMergeTableDlg : public weld::GenericDialogController +class SwMergeTableDlg final : public weld::GenericDialogController { bool& m_rMergePrev; diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index 5027e216e5e8..7e2fead65048 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -25,7 +25,7 @@ class SwTOXMgr; // insert mark for index entry -class SwMultiTOXMarkDlg : public weld::GenericDialogController +class SwMultiTOXMarkDlg final : public weld::GenericDialogController { DECL_LINK(SelectHdl, weld::TreeView&, void); SwTOXMgr& m_rMgr; diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx index a9b562493623..43bf52b3d7ed 100644 --- a/sw/source/uibase/inc/navicfg.hxx +++ b/sw/source/uibase/inc/navicfg.hxx @@ -24,7 +24,7 @@ enum class RegionMode; enum class ContentTypeId; -class SwNavigationConfig : public utl::ConfigItem +class SwNavigationConfig final : public utl::ConfigItem { ContentTypeId nRootType; //RootType sal_Int32 nSelectedPos; //SelectedPosition diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index c203284ca500..85eacaf826e5 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -39,7 +39,7 @@ class SfxObjectShellLock; enum class RegionMode; class SpinField; -class SwNavigationPI : public PanelLayout +class SwNavigationPI final : public PanelLayout , public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface , public SfxListener { @@ -115,8 +115,6 @@ class SwNavigationPI : public PanelLayout void UpdateInitShow(); -protected: - // release ObjectShellLock early enough for app end virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index ff4d1e7671b7..781023f0a949 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -27,7 +27,7 @@ class SwWrtShell; class SvxBrushItem; class SwOutlineTabDialog; -class SwNumPositionTabPage : public SfxTabPage +class SwNumPositionTabPage final : public SfxTabPage { std::unique_ptr<SwNumRule> pActNum; SwNumRule* pSaveNum; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index a5776659130a..437537307d7d 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -70,7 +70,7 @@ public: virtual ~SwNumFormatBase() {} }; -class SW_DLLPUBLIC NumFormatListBox : public SwNumFormatBase +class SW_DLLPUBLIC NumFormatListBox final : public SwNumFormatBase { std::unique_ptr<weld::ComboBox> mxControl; @@ -101,7 +101,7 @@ public: void connect_changed(const Link<weld::ComboBox&, void>& rLink) { mxControl->connect_changed(rLink); } }; -class SW_DLLPUBLIC SwNumFormatTreeView : public SwNumFormatBase +class SW_DLLPUBLIC SwNumFormatTreeView final : public SwNumFormatBase { std::unique_ptr<weld::TreeView> mxControl; diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index af86246d6a46..3c9059c06cec 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -25,7 +25,7 @@ class SwNumRule; namespace rtl { class OUString; } -class NumberingPreview : public weld::CustomWidgetController +class NumberingPreview final : public weld::CustomWidgetController { const SwNumRule* pActNum; vcl::Font aStdFont; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index c6d907656e67..42ebc49d1c04 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -27,7 +27,7 @@ class SwWrtShell; struct SwCompatibilityOptPage_Impl; -class SwCompatibilityOptPage : public SfxTabPage +class SwCompatibilityOptPage final : public SfxTabPage { private: // config item diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 931156795eb8..6dee914d89c8 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -40,7 +40,7 @@ public: static FieldUnit GetValue(sal_uInt32 i); }; -class TextFilterAutoConvert : public TextFilter +class TextFilterAutoConvert final : public TextFilter { private: OUString m_sLastGoodText; @@ -53,7 +53,7 @@ public: virtual OUString filter(const OUString &rText) override; }; -class SwLoadOptPage : public SfxTabPage +class SwLoadOptPage final : public SfxTabPage { private: SwWrtShell* m_pWrtShell; @@ -90,13 +90,13 @@ public: virtual void Reset( const SfxItemSet* rSet ) override; }; -class SwCaptionOptDlg : public SfxSingleTabDialogController +class SwCaptionOptDlg final : public SfxSingleTabDialogController { public: SwCaptionOptDlg(weld::Window* pParent, const SfxItemSet& rSet); }; -class SwCaptionPreview : public weld::CustomWidgetController +class SwCaptionPreview final : public weld::CustomWidgetController { private: OUString maText; @@ -112,7 +112,7 @@ public: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; }; -class SwCaptionOptPage : public SfxTabPage +class SwCaptionOptPage final : public SfxTabPage { private: OUString m_sSWTable; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index dfd0e4d4bf85..99e24ed7f487 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -33,7 +33,7 @@ class FontList; // Tools->Options->Writer->View // Tools->Options->Writer/Web->View -class SwContentOptPage : public SfxTabPage +class SwContentOptPage final : public SfxTabPage { std::unique_ptr<weld::CheckButton> m_xCrossCB; @@ -74,7 +74,7 @@ public: }; // TabPage printer settings additions -class SwAddPrinterTabPage : public SfxTabPage +class SwAddPrinterTabPage final : public SfxTabPage { OUString sNone; bool bAttrModified; @@ -120,7 +120,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) override; }; -class SwStdFontTabPage : public SfxTabPage +class SwStdFontTabPage final : public SfxTabPage { OUString m_sShellStd; OUString m_sShellTitle; @@ -181,7 +181,7 @@ public: virtual void PageCreated(const SfxAllItemSet& aSet) override; }; -class SwTableOptionsTabPage : public SfxTabPage +class SwTableOptionsTabPage final : public SfxTabPage { SwWrtShell* m_pWrtShell; bool m_bHTMLMode; @@ -221,7 +221,7 @@ public: }; // TabPage for ShadowCursor -class SwShdwCursorOptionsTabPage : public SfxTabPage +class SwShdwCursorOptionsTabPage final : public SfxTabPage { SwWrtShell * m_pWrtShell; @@ -262,7 +262,7 @@ public: }; // mark preview -class SwMarkPreview : public weld::CustomWidgetController +class SwMarkPreview final : public weld::CustomWidgetController { Color m_aBgCol; // background Color m_aTransCol; // transparency @@ -292,7 +292,7 @@ public: }; // redlining options -class SwRedlineOptionsTabPage : public SfxTabPage +class SwRedlineOptionsTabPage final : public SfxTabPage { std::unique_ptr<weld::ComboBox> m_xInsertLB; std::unique_ptr<ColorListBox> m_xInsertColorLB; @@ -336,7 +336,7 @@ public: #ifdef DBG_UTIL -class SwTestTabPage : public SfxTabPage +class SwTestTabPage final : public SfxTabPage { public: SwTestTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -366,7 +366,7 @@ private: }; #endif // DBG_UTIL -class SwCompareOptionsTabPage : public SfxTabPage +class SwCompareOptionsTabPage final : public SfxTabPage { std::unique_ptr<weld::RadioButton> m_xAutoRB; std::unique_ptr<weld::RadioButton> m_xWordRB; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 17b9568bac23..6d9a23ab506a 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -63,7 +63,7 @@ public: static void SetActNumLevel(sal_uInt16 nSet) {nNumLevel = nSet;} }; -class SwOutlineSettingsTabPage : public SfxTabPage +class SwOutlineSettingsTabPage final : public SfxTabPage { OUString aNoFormatName; OUString aSaveCollNames[MAXLEVEL]; diff --git a/sw/source/uibase/inc/pattern.hxx b/sw/source/uibase/inc/pattern.hxx index 4be18c6342a8..06bb5bb06e71 100644 --- a/sw/source/uibase/inc/pattern.hxx +++ b/sw/source/uibase/inc/pattern.hxx @@ -22,7 +22,7 @@ #include <sfx2/basedlgs.hxx> -class SwBackgroundDlg : public SfxSingleTabDialogController +class SwBackgroundDlg final : public SfxSingleTabDialogController { public: SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 1bf5bd63fa81..6fc8196161b1 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -24,7 +24,7 @@ #include <svx/colorbox.hxx> // footnote settings TabPage -class SwFootNotePage: public SfxTabPage +class SwFootNotePage final : public SfxTabPage { static const sal_uInt16 aPageRg[]; public: diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index a714abff7fd4..be53c1a6721a 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -26,7 +26,7 @@ #include <svx/colorbox.hxx> // TabPage Format/(Styles/)Page/Text grid -class SwTextGridPage: public SfxTabPage +class SwTextGridPage final : public SfxTabPage { sal_Int32 m_nRubyUserValue; bool m_bRubyUserValue; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 6a2c898069f0..ec573024d206 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -43,7 +43,7 @@ class SvtAccessibilityOptions; class SwPagePreviewLayout; // Delete member <mnVirtPage> and its accessor -class SAL_DLLPUBLIC_RTTI SwPagePreviewWin : public vcl::Window +class SAL_DLLPUBLIC_RTTI SwPagePreviewWin final : public vcl::Window { SwViewShell* mpViewShell; sal_uInt16 mnSttPage; @@ -158,7 +158,7 @@ public: /** * View of a document */ -class SW_DLLPUBLIC SwPagePreview: public SfxViewShell +class SW_DLLPUBLIC SwPagePreview final : public SfxViewShell { // ViewWindow and handle to core // current dispatcher shell @@ -217,7 +217,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE void ExecPgUpAndPgDown( const bool _bPgUp, SfxRequest* _pReq ); -protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index e07af66b3aa3..0e38dd83764e 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -122,7 +122,7 @@ public: void Activate(); }; -class SwModelessRedlineAcceptDlg : public SfxModelessDialogController +class SwModelessRedlineAcceptDlg final : public SfxModelessDialogController { std::unique_ptr<weld::Container> m_xContentArea; std::unique_ptr<SwRedlineAcceptDlg> m_xImplDlg; @@ -137,7 +137,7 @@ public: void Initialize(SfxChildWinInfo * pInfo); }; -class SwRedlineAcceptChild : public SwChildWinWrapper +class SwRedlineAcceptChild final : public SwChildWinWrapper { public: SwRedlineAcceptChild(vcl::Window* , @@ -151,7 +151,7 @@ public: }; /// Redline (Manage Changes) panel for the sidebar. -class SwRedlineAcceptPanel : public PanelLayout, public SfxListener +class SwRedlineAcceptPanel final : public PanelLayout, public SfxListener { std::unique_ptr<SwRedlineAcceptDlg> mpImplDlg; std::unique_ptr<weld::Container> mxContentArea; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index fb959c521d1e..b9e1165e3197 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -43,7 +43,7 @@ namespace sfx2 class SectRepr; typedef std::map<size_t, std::unique_ptr<SectRepr>> SectReprs_t; -class SwEditRegionDlg : public SfxDialogController +class SwEditRegionDlg final : public SfxDialogController { bool m_bSubRegionsFilled; @@ -115,7 +115,7 @@ public: }; // dialog "insert region" -class SwInsertSectionTabPage : public SfxTabPage +class SwInsertSectionTabPage final : public SfxTabPage { OUString m_sFileName; OUString m_sFilterName; @@ -205,7 +205,7 @@ public: const SfxItemSet* rAttrSet); }; -class SwSectionIndentTabPage : public SfxTabPage +class SwSectionIndentTabPage final : public SfxTabPage { SvxParaPrevWindow m_aPreviewWin; std::unique_ptr<weld::MetricSpinButton> m_xBeforeMF; @@ -225,12 +225,11 @@ public: void SetWrtShell(SwWrtShell const & rSh); }; -class SwInsertSectionTabDialog : public SfxTabDialogController +class SwInsertSectionTabDialog final : public SfxTabDialogController { SwWrtShell& rWrtSh; std::unique_ptr<SwSectionData> m_pSectionData; -protected: virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; virtual short Ok() override; public: @@ -241,11 +240,10 @@ public: SwSectionData * GetSectionData() { return m_pSectionData.get(); } }; -class SwSectionPropertyTabDialog : public SfxTabDialogController +class SwSectionPropertyTabDialog final : public SfxTabDialogController { SwWrtShell& rWrtSh; -protected: virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; public: SwSectionPropertyTabDialog(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index f1d66dbab63f..659b9ac6331a 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -23,7 +23,7 @@ class SwWrtShell; -class SwTableHeightDlg : public weld::GenericDialogController +class SwTableHeightDlg final : public weld::GenericDialogController { SwWrtShell& m_rSh; diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 883b896a2c63..6a532b0ed28d 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -20,7 +20,7 @@ #include <vcl/scrbar.hxx> -class SwScrollbar: public ScrollBar +class SwScrollbar final : public ScrollBar { Size aDocSz; bool bHori :1; // horizontal = salTrue, otherwise vertical diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 523632ef8045..99e61f7d4075 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -24,7 +24,7 @@ class SwWrtShell; -class SwSplitTableDlg : public weld::GenericDialogController +class SwSplitTableDlg final : public weld::GenericDialogController { private: std::unique_ptr<weld::RadioButton> m_xHorzBox; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 7a989b4bff39..51457cd7c97f 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -35,11 +35,10 @@ class TextEngine; class TextView; class DataChangedEvent; -class TextViewOutWin : public vcl::Window +class TextViewOutWin final : public vcl::Window { TextView* pTextView; -protected: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -56,7 +55,7 @@ public: }; -class SwSrcEditWindow : public vcl::Window, public SfxListener +class SwSrcEditWindow final : public vcl::Window, public SfxListener { private: class ChangesListener; @@ -92,8 +91,6 @@ private: using Window::Invalidate; -protected: - virtual void Resize() override; virtual void DataChanged( const DataChangedEvent& ) override; virtual void GetFocus() override; diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index a2e8277b9892..f58712b57e59 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -30,7 +30,7 @@ class SwDocShell; class SvxSearchItem; class SfxMedium; -class SwSrcView: public SfxViewShell +class SwSrcView final : public SfxViewShell { VclPtr<SwSrcEditWindow> aEditWin; @@ -43,7 +43,6 @@ class SwSrcView: public SfxViewShell // for read-only switching virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; -protected: void StartSearchAndReplace(const SvxSearchItem& rItem, bool bApi, bool bRecursive = false); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 2e3a6a137088..2b6a39092f5b 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -25,7 +25,7 @@ class SwWrtShell; -class SwSortDlg : public weld::GenericDialogController +class SwSortDlg final : public weld::GenericDialogController { weld::Window* m_pParent; std::unique_ptr<weld::Label> m_xColLbl; diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index e4575ad4796e..7f410739f079 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -72,7 +72,7 @@ enum class PasteTableType PASTE_TABLE // paste table as nested table }; -class SW_DLLPUBLIC SwTransferable : public TransferableHelper +class SW_DLLPUBLIC SwTransferable final : public TransferableHelper { friend class SwView_Impl; SfxObjectShellLock m_aDocShellRef; @@ -155,7 +155,6 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SwTransferable( const SwTransferable& ) = delete; SwTransferable& operator=( const SwTransferable& ) = delete; -protected: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual bool WriteObject( tools::SvRef<SotTempStream>& rxOStm, diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx index 450380b33c2c..00d4e1e028f1 100644 --- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx @@ -22,7 +22,7 @@ class SwRedlineAcceptDlg; -class SwModalRedlineAcceptDlg : public SfxDialogController +class SwModalRedlineAcceptDlg final : public SfxDialogController { std::unique_ptr<weld::Container> m_xContentArea; std::unique_ptr<SwRedlineAcceptDlg> m_xImplDlg; diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index fee64c7d6681..bb8333d3fb7e 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> -class SwRenameXNamedDlg : public weld::GenericDialogController +class SwRenameXNamedDlg final : public weld::GenericDialogController { css::uno::Reference< css::container::XNamed > & xNamed; css::uno::Reference< css::container::XNameAccess > & xNameAccess; diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 86d24b9138c2..80adad95fe73 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -26,7 +26,7 @@ class SwWrtShell; class SwFormat; -class SwCondCollPage : public SfxTabPage +class SwCondCollPage final : public SfxTabPage { std::vector<OUString> m_aStrArr; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 5afa438eb5a1..8d3fc168da2f 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -52,7 +52,7 @@ struct SwIndexSections_Impl css::uno::Reference< css::text::XDocumentIndex > xDocumentIndex; }; -class SwMultiTOXTabDialog : public SfxTabDialogController +class SwMultiTOXTabDialog final : public SfxTabDialogController { std::unique_ptr<SwTOXMgr> m_pMgr; SwWrtShell& m_rWrtShell; @@ -114,7 +114,7 @@ public: static bool IsNoNum(SwWrtShell& rSh, const OUString& rName); }; -class SwTOXSelectTabPage : public SfxTabPage +class SwTOXSelectTabPage final : public SfxTabPage { std::unique_ptr<IndexEntryResource> pIndexRes; @@ -301,7 +301,7 @@ private: sal_uInt32 GetControlIndex(FormTokenType eType) const; }; -class SwTOXEntryTabPage : public SfxTabPage +class SwTOXEntryTabPage final : public SfxTabPage { OUString sDelimStr; OUString sLevelStr; @@ -399,7 +399,7 @@ public: void SetFocus2theAllBtn(); }; -class SwTOXStylesTabPage : public SfxTabPage +class SwTOXStylesTabPage final : public SfxTabPage { std::unique_ptr<SwForm> m_pCurrentForm; diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 617425c6def8..1c4a38e0fcf3 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -133,7 +133,7 @@ public: bool IsTOXType(const OUString& rName) { return m_xTypeDCB->find_text(rName) != -1; } }; -class SwIndexMarkFloatDlg : public SfxModelessDialogController +class SwIndexMarkFloatDlg final : public SfxModelessDialogController { SwIndexMarkPane m_aContent; @@ -147,7 +147,7 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -class SwIndexMarkModalDlg : public SfxDialogController +class SwIndexMarkModalDlg final : public SfxDialogController { SwIndexMarkPane m_aContent; public: @@ -207,7 +207,7 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -class SwAuthMarkFloatDlg : public SfxModelessDialogController +class SwAuthMarkFloatDlg final : public SfxModelessDialogController { SwAuthorMarkPane m_aContent; virtual void Activate() override; @@ -220,7 +220,7 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -class SwAuthMarkModalDlg : public SfxDialogController +class SwAuthMarkModalDlg final : public SfxDialogController { SwAuthorMarkPane m_aContent; diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index bd282a470b20..de5e83828a91 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -23,7 +23,7 @@ #include <sfx2/tabdlg.hxx> -class SwParaDlg: public SfxTabDialogController +class SwParaDlg final : public SfxTabDialogController { SwView& rView; bool bDrawParaDlg; diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index 45be074db906..cae378413ded 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -23,7 +23,7 @@ class SwWrtShell; -class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem +class SW_DLLPUBLIC SwWrtShellItem final : public SfxPoolItem { SwWrtShell* pWrtSh; diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index 43ae7ac43f34..e100edc2eff1 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -22,7 +22,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> -class SwSyncBtnDlg : public SfxModelessDialogController +class SwSyncBtnDlg final : public SfxModelessDialogController { std::unique_ptr<weld::Button> m_xSyncBtn; @@ -33,7 +33,7 @@ public: virtual ~SwSyncBtnDlg() override; }; -class SwSyncChildWin : public SfxChildWindow +class SwSyncChildWin final : public SfxChildWindow { public: SwSyncChildWin(vcl::Window*, diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 1b0dd0917b18..0edb8efed3cb 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -25,7 +25,7 @@ class SwWrtShell; struct TColumn; // table dialog -class SwTableTabDlg : public SfxTabDialogController +class SwTableTabDlg final : public SfxTabDialogController { SwWrtShell* pShell; diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index f5ea72206dad..4c03bd981d92 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -33,7 +33,7 @@ class SwTableAutoFormat; class SwTableAutoFormatTable; class SwWrtShell; -class SwAutoFormatDlg : public SfxDialogController +class SwAutoFormatDlg final : public SfxDialogController { OUString m_aStrTitle; OUString m_aStrLabel; diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx index 3d0eee08c6ea..8e0f32f3eabb 100644 --- a/sw/source/uibase/inc/tblnumfm.hxx +++ b/sw/source/uibase/inc/tblnumfm.hxx @@ -27,7 +27,7 @@ class Window; } class SfxItemSet; -class SwNumFormatDlg : public SfxSingleTabDialogController +class SwNumFormatDlg final : public SfxSingleTabDialogController { public: SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index c37def2e3e41..35a97c13041f 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -21,7 +21,7 @@ class Window; class SwWrtShell; class SwPageDesc; -class SwTitlePageDlg : public SfxDialogController +class SwTitlePageDlg final : public SfxDialogController { private: SwWrtShell& mrSh; diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index 95682aaa07e5..e77b928bff19 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -26,7 +26,7 @@ class SfxItemSet; class SwWrtShell; // the tab dialog carrier of TabPages -class SwTemplateDlgController : public SfxStyleDialogController +class SwTemplateDlgController final : public SfxStyleDialogController { SfxStyleFamily nType; diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx index cf089fae618d..dfd0af308625 100644 --- a/sw/source/uibase/inc/tmplctrl.hxx +++ b/sw/source/uibase/inc/tmplctrl.hxx @@ -21,9 +21,8 @@ #include <sfx2/stbitem.hxx> -class SwTemplateControl : public SfxStatusBarControl +class SwTemplateControl final : public SfxStatusBarControl { -protected: virtual void Command(const CommandEvent& rCEvt) override; public: diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx index 8820a769b5c9..e0b98570dc26 100644 --- a/sw/source/uibase/inc/uiborder.hxx +++ b/sw/source/uibase/inc/uiborder.hxx @@ -22,7 +22,7 @@ #include <sfx2/basedlgs.hxx> #include <svx/flagsdef.hxx> -class SwBorderDlg : public SfxSingleTabDialogController +class SwBorderDlg final : public SfxSingleTabDialogController { public: // nType may be: diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 629013cf32b8..c108c9e915c3 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -29,7 +29,7 @@ class IntlWrapper; class SwPaM; // container for FootNote -class SW_DLLPUBLIC SwPageFootnoteInfoItem : public SfxPoolItem +class SW_DLLPUBLIC SwPageFootnoteInfoItem final : public SfxPoolItem { SwPageFootnoteInfo aFootnoteInfo; @@ -58,7 +58,7 @@ public: const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; } }; -class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem +class SW_DLLPUBLIC SwPtrItem final : public SfxPoolItem { void* pMisc; @@ -71,7 +71,7 @@ public: void* GetValue() const { return pMisc; } }; -class SW_DLLPUBLIC SwUINumRuleItem : public SfxPoolItem +class SW_DLLPUBLIC SwUINumRuleItem final : public SfxPoolItem { std::unique_ptr<SwNumRule> pRule; @@ -90,7 +90,7 @@ public: SwNumRule* GetNumRule() { return pRule.get(); } }; -class SwPaMItem : public SfxPoolItem +class SwPaMItem final : public SfxPoolItem { SwPaM* m_pPaM; diff --git a/sw/source/uibase/inc/uiobject.hxx b/sw/source/uibase/inc/uiobject.hxx index 7f6ff239be6b..248654023e32 100644 --- a/sw/source/uibase/inc/uiobject.hxx +++ b/sw/source/uibase/inc/uiobject.hxx @@ -19,7 +19,7 @@ #include <AnnotationWin.hxx> -class SwEditWinUIObject : public WindowUIObject +class SwEditWinUIObject final : public WindowUIObject { public: @@ -32,8 +32,6 @@ public: static std::unique_ptr<UIObject> create(vcl::Window* pWindow); -protected: - virtual OUString get_name() const override; private: @@ -43,7 +41,7 @@ private: }; // This class handles the Comments as a UIObject to be used in UITest Framework -class CommentUIObject : public WindowUIObject +class CommentUIObject final : public WindowUIObject { VclPtr<sw::annotation::SwAnnotationWin> mxCommentUIObject; @@ -58,13 +56,13 @@ public: static std::unique_ptr<UIObject> create(vcl::Window* pWindow); -protected: +private: OUString get_name() const override; }; -class PageBreakUIObject : public WindowUIObject +class PageBreakUIObject final : public WindowUIObject { public: @@ -75,12 +73,10 @@ public: static std::unique_ptr<UIObject> create(vcl::Window* pWindow); -protected: +private: virtual OUString get_name() const override; -private: - VclPtr<SwPageBreakWin> mxPageBreakUIObject; }; diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index ae9f3d7b3693..1b407b73e2dd 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -42,7 +42,7 @@ namespace com::sun::star { } } -class SwScannerEventListener : public ::cppu::WeakImplHelper< +class SwScannerEventListener final : public ::cppu::WeakImplHelper< css::lang::XEventListener > { SwView* pView; @@ -60,7 +60,7 @@ public: }; // Clipboard EventListener -class SwClipboardChangeListener : public ::cppu::WeakImplHelper< +class SwClipboardChangeListener final : public ::cppu::WeakImplHelper< css::datatransfer::clipboard::XClipboardListener > { SwView* pView; diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index dba379b2c43e..376b1dced7c5 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -48,7 +48,7 @@ class SwXBodyText; typedef tools::SvRef<SwDocShell> SwDocShellRef; #endif -class SwXAutoTextContainer : public cppu::WeakImplHelper +class SwXAutoTextContainer final : public cppu::WeakImplHelper < css::text::XAutoTextContainer2, css::lang::XServiceInfo @@ -56,7 +56,6 @@ class SwXAutoTextContainer : public cppu::WeakImplHelper { SwGlossaries *pGlossaries; -protected: virtual ~SwXAutoTextContainer() override; // ref-counted objects are not to be deleted from outside -> protected dtor public: @@ -86,7 +85,7 @@ public: }; -class SwXAutoTextGroup : public cppu::WeakImplHelper +class SwXAutoTextGroup final : public cppu::WeakImplHelper < css::text::XAutoTextGroup, css::beans::XPropertySet, @@ -101,7 +100,6 @@ class SwXAutoTextGroup : public cppu::WeakImplHelper OUString sName; OUString m_sGroupName; // prefix m_ to disambiguate from some local vars in the implementation -protected: virtual ~SwXAutoTextGroup() override; // ref-counted objects are not to be deleted from outside -> protected dtor public: @@ -239,7 +237,7 @@ public: }; /** Implement the XNameAccess for the AutoText events */ -class SwAutoTextEventDescriptor : public SvBaseEventDescriptor +class SwAutoTextEventDescriptor final : public SvBaseEventDescriptor { SwXAutoTextEntry& rAutoTextEntry; @@ -253,7 +251,7 @@ public: virtual OUString SAL_CALL getImplementationName() override; -protected: +private: virtual void replaceByName( const SvMacroItemId nEvent, /// item ID of event diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 2b35f7cd3a13..325c992e43fd 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -62,7 +62,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32> class SwDBManager; class MailMergeExecuteFinalizer; -class SwXMailMerge : +class SwXMailMerge final : public cppu::WeakImplHelper < css::task::XJob, @@ -128,7 +128,7 @@ class SwXMailMerge : SwXMailMerge( const SwXMailMerge & ) = delete; SwXMailMerge & operator = ( const SwXMailMerge & ) = delete; -protected: + virtual ~SwXMailMerge() override; public: SwXMailMerge(); diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index c5d45ed3a6ef..4e56f9f8be5f 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -36,7 +36,7 @@ class SwView; -class SW_DLLPUBLIC SwOneExampleFrame : public weld::CustomWidgetController +class SW_DLLPUBLIC SwOneExampleFrame final : public weld::CustomWidgetController { ScopedVclPtr<VirtualDevice> m_xVirDev; css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 41ba99b6c988..e93d6a050d06 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -27,7 +27,7 @@ class SwMasterUsrPref; -class SwContentViewConfig : public utl::ConfigItem +class SwContentViewConfig final : public utl::ConfigItem { private: SwMasterUsrPref& m_rParent; @@ -48,7 +48,7 @@ public: using ConfigItem::SetModified; }; -class SwLayoutViewConfig : public utl::ConfigItem +class SwLayoutViewConfig final : public utl::ConfigItem { private: SwMasterUsrPref& m_rParent; @@ -67,7 +67,7 @@ public: using ConfigItem::SetModified; }; -class SwGridConfig : public utl::ConfigItem +class SwGridConfig final : public utl::ConfigItem { private: SwMasterUsrPref& m_rParent; @@ -85,7 +85,7 @@ public: using ConfigItem::SetModified; }; -class SwCursorConfig : public utl::ConfigItem +class SwCursorConfig final : public utl::ConfigItem { private: SwMasterUsrPref& m_rParent; @@ -103,7 +103,7 @@ public: using ConfigItem::SetModified; }; -class SwWebColorConfig : public utl::ConfigItem +class SwWebColorConfig final : public utl::ConfigItem { private: SwMasterUsrPref& m_rParent; diff --git a/sw/source/uibase/inc/viewlayoutctrl.hxx b/sw/source/uibase/inc/viewlayoutctrl.hxx index b531ef4f21ae..716b5fdbfbf5 100644 --- a/sw/source/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/uibase/inc/viewlayoutctrl.hxx @@ -22,7 +22,7 @@ #include <sfx2/stbitem.hxx> #include <memory> -class SwViewLayoutControl : public SfxStatusBarControl +class SwViewLayoutControl final : public SfxStatusBarControl { private: diff --git a/sw/source/uibase/inc/watermarkdialog.hxx b/sw/source/uibase/inc/watermarkdialog.hxx index dff87a792a57..57281a4d3faa 100644 --- a/sw/source/uibase/inc/watermarkdialog.hxx +++ b/sw/source/uibase/inc/watermarkdialog.hxx @@ -14,7 +14,7 @@ #include <svx/colorbox.hxx> #include <sfx2/basedlgs.hxx> -class SwWatermarkDialog : public SfxDialogController +class SwWatermarkDialog final : public SfxDialogController { public: SwWatermarkDialog(weld::Window* pParent, SfxBindings& rBindings); diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx index d8ecc4a5963d..2079729741e9 100644 --- a/sw/source/uibase/inc/wordcountctrl.hxx +++ b/sw/source/uibase/inc/wordcountctrl.hxx @@ -19,7 +19,7 @@ Word count status bar control for Writer. logic whatsoever. The actual updating of the word count string happens in SwView::StateStatusLine (see sw/source/ui/uiview/view2.cxx). */ -class SwWordCountStatusBarControl : public SfxStatusBarControl +class SwWordCountStatusBarControl final : public SfxStatusBarControl { public: SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index dafc87ea0913..653a04e6bfeb 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -23,7 +23,7 @@ struct SwDocStat; #include <sfx2/childwin.hxx> #include <swabstdlg.hxx> -class SwWordCountFloatDlg : public SfxModelessDialogController +class SwWordCountFloatDlg final : public SfxModelessDialogController { void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc); void showCJK(bool bShowCJK); diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 7f4d93a4afae..1ffa50ead702 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -51,7 +51,7 @@ class SwView; #define NID_FIELD_BYTYPE 20020 #define NID_COUNT 21 -class SwTbxAutoTextCtrl : public SfxToolBoxControl +class SwTbxAutoTextCtrl final : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); @@ -67,7 +67,7 @@ public: DECL_STATIC_LINK(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool); }; -class SwPreviewZoomControl : public SfxToolBoxControl +class SwPreviewZoomControl final : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); @@ -82,7 +82,7 @@ public: virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; -class SwJumpToSpecificPageControl : public SfxToolBoxControl +class SwJumpToSpecificPageControl final : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 6588bd359953..7ce99b1696d3 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -27,14 +27,14 @@ namespace vcl { class Window; } class SfxItemSet; class SwWrtShell; -class SwWrapDlg : public SfxSingleTabDialogController +class SwWrapDlg final : public SfxSingleTabDialogController { public: SwWrapDlg(weld::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode); }; // circulation TabPage -class SwWrapTabPage: public SfxTabPage +class SwWrapTabPage final : public SfxTabPage { RndStdIds m_nAnchorId; sal_uInt16 m_nHtmlMode; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 96c7cec3b31a..727d4cfb64c9 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -90,7 +90,7 @@ namespace o3tl { Eg. the Insert() method will take the current cursor position, insert the string, and take care of undo etc. */ -class SW_DLLPUBLIC SwWrtShell: public SwFEShell +class SW_DLLPUBLIC SwWrtShell final : public SwFEShell { private: using SwCursorShell::Left; diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx index 02d89b0dc5bb..38119e0b5a68 100644 --- a/sw/source/uibase/inc/zoomctrl.hxx +++ b/sw/source/uibase/inc/zoomctrl.hxx @@ -21,7 +21,7 @@ #include <svx/zoomctrl.hxx> -class SwZoomControl : public SvxZoomStatusBarControl +class SwZoomControl final : public SvxZoomStatusBarControl { private: OUString sPreviewZoom; |