basctl/source/inc/IDEComboBox.hxx | 14 ++++++-------- basctl/source/inc/ObjectCatalog.hxx | 2 +- basctl/source/inc/baside3.hxx | 17 +++++------------ basctl/source/inc/basidectrlr.hxx | 4 ++-- basctl/source/inc/basidesh.hxx | 2 +- basctl/source/inc/bastype2.hxx | 7 +++---- basctl/source/inc/bastypes.hxx | 3 +-- basctl/source/inc/dlged.hxx | 4 ++-- basctl/source/inc/dlgedfunc.hxx | 4 ++-- basctl/source/inc/dlgedlist.hxx | 4 ++-- basctl/source/inc/dlgedmod.hxx | 2 +- basctl/source/inc/dlgedobj.hxx | 6 +----- basctl/source/inc/dlgedview.hxx | 4 ++-- basctl/source/inc/managelang.hxx | 4 ++-- basctl/source/inc/sbxitem.hxx | 2 +- sd/inc/Annotation.hxx | 2 +- sd/inc/CustomAnimationEffect.hxx | 4 ++-- sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 2 +- sd/source/ui/inc/RemoteServer.hxx | 2 +- sd/source/ui/inc/SdUnoOutlineView.hxx | 2 +- sd/source/ui/inc/SdUnoSlideView.hxx | 2 +- sd/source/ui/inc/SlideSorterViewShell.hxx | 5 ++--- sd/source/ui/inc/SlideSorterViewShellBase.hxx | 2 +- sd/source/ui/inc/SlideTransitionPane.hxx | 2 +- sd/source/ui/inc/SpellDialogChildWindow.hxx | 5 ++--- sd/source/ui/inc/TabControl.hxx | 2 +- sd/source/ui/inc/TableDesignPane.hxx | 4 ++-- sd/source/ui/inc/TemplateScanner.hxx | 2 +- sd/source/ui/inc/TextObjectBar.hxx | 2 +- sd/source/ui/inc/ViewTabBar.hxx | 4 ++-- sd/source/ui/inc/WindowUpdater.hxx | 2 +- sd/source/ui/inc/prltempl.hxx | 2 +- sd/source/ui/inc/prntopts.hxx | 2 +- sd/source/ui/inc/pubdlg.hxx | 2 +- sd/source/ui/inc/scalectrl.hxx | 4 ++-- sd/source/ui/inc/sdpreslt.hxx | 2 +- sd/source/ui/inc/sdtreelb.hxx | 4 ++-- sd/source/ui/inc/sdundogr.hxx | 2 +- sd/source/ui/inc/slideshow.hxx | 2 +- sd/source/ui/inc/tabtempl.hxx | 2 +- sd/source/ui/inc/tmplctrl.hxx | 5 ++--- sd/source/ui/inc/tpaction.hxx | 4 ++-- sd/source/ui/inc/tpoption.hxx | 7 +++---- sd/source/ui/inc/uiobject.hxx | 5 ++--- sd/source/ui/inc/unchss.hxx | 2 +- sd/source/ui/inc/undoback.hxx | 2 +- sd/source/ui/inc/undoheaderfooter.hxx | 2 +- sd/source/ui/inc/undolayer.hxx | 2 +- sd/source/ui/inc/undopage.hxx | 6 +++--- sd/source/ui/inc/unmodpg.hxx | 4 ++-- sd/source/ui/inc/unmovss.hxx | 2 +- sd/source/ui/inc/unoaprms.hxx | 2 +- sd/source/ui/inc/unomodel.hxx | 2 +- sd/source/ui/inc/unopage.hxx | 2 +- sd/source/ui/inc/unosrch.hxx | 3 +-- sd/source/ui/inc/unprlout.hxx | 2 +- sd/source/ui/inc/vectdlg.hxx | 2 +- 57 files changed, 89 insertions(+), 110 deletions(-)
New commits: commit 9ce9011230a97f3fe4fcd2f8d761781c4300772b Author: Noel Grandin <[email protected]> AuthorDate: Wed Nov 3 10:53:11 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Nov 3 11:05:15 2021 +0100 loplugin:finalclasses Change-Id: I72ffe7dbeb1558820ac4368ef551611096da0104 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124632 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index a5e7008a42e9..5c5fdfc8385b 100644 --- a/basctl/source/inc/IDEComboBox.hxx +++ b/basctl/source/inc/IDEComboBox.hxx @@ -33,7 +33,7 @@ namespace basctl * * @see LibBox Class */ -class LibBoxControl : public SfxToolBoxControl +class LibBoxControl final : public SfxToolBoxControl { public: /*! @@ -121,7 +121,7 @@ public: * * @see LibBoxControl Class */ -class LibBox : public DocListenerBox +class LibBox final : public DocListenerBox { public: /// @param pParent @@ -136,11 +136,10 @@ public: */ void Update(const SfxStringItem* pItem); -protected: +private: /// Called for setting language when user selects a language in ComboBox virtual void Select() override; -private: static void ReleaseFocus(); /*! @@ -178,7 +177,7 @@ private: * * @see LanguageBox Class */ -class LanguageBoxControl : public SfxToolBoxControl +class LanguageBoxControl final : public SfxToolBoxControl { public: /*! Macro for registering two methods @@ -221,7 +220,7 @@ public: * * @see LanguageBoxControl Class */ -class LanguageBox : public DocListenerBox +class LanguageBox final : public DocListenerBox { public: /*! @@ -238,7 +237,7 @@ public: */ void Update(const SfxStringItem* pItem); -protected: +private: /// Called for setting language when user selects a language in ComboBox virtual void Select() override; @@ -250,7 +249,6 @@ protected: */ virtual bool HandleKeyInput(const KeyEvent& rKEvt) override; -private: /// Delete all languages from ComboBox void ClearBox(); /// Switch interface of dialog to selected language diff --git a/basctl/source/inc/ObjectCatalog.hxx b/basctl/source/inc/ObjectCatalog.hxx index a5b63eef424a..8ea0cd023b67 100644 --- a/basctl/source/inc/ObjectCatalog.hxx +++ b/basctl/source/inc/ObjectCatalog.hxx @@ -33,7 +33,7 @@ namespace basctl * in a tree structure which allows user to quickly select the necessary * macro in BasicIDE. */ -class ObjectCatalog : public DockingWindow +class ObjectCatalog final : public DockingWindow { public: explicit ObjectCatalog(vcl::Window* pParent); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index f5d367182d0a..3eef27cd2f63 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -45,15 +45,13 @@ class ObjectCatalog; bool implImportDialog(weld::Window* pWin, const ScriptDocument& rDocument, const OUString& rLibName); -class DialogWindow: public BaseWindow +class DialogWindow final : public BaseWindow { -private: DialogWindowLayout& m_rLayout; std::unique_ptr<DlgEditor> m_pEditor; std::unique_ptr<SfxUndoManager> m_pUndoMgr; // never nullptr sal_uInt16 m_nControlSlotId; -protected: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void Resize() override; virtual void dispose() override; @@ -114,37 +112,32 @@ public: // DialogWindowLayout -class DialogWindowLayout : public Layout +class DialogWindowLayout final : public Layout { public: DialogWindowLayout (vcl::Window* pParent, ObjectCatalog&); virtual ~DialogWindowLayout() override; virtual void dispose() override; -public: void ShowPropertyBrowser (); void UpdatePropertyBrowser (); void DisablePropertyBrowser (); -public: // Layout: virtual void Activating (BaseWindow&) override; virtual void Deactivating () override; virtual void ExecuteGlobal (SfxRequest&) override; virtual void GetState (SfxItemSet&, unsigned nWhich) override; virtual void UpdateDebug (bool) override {}; -protected: - // Layout: - virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) override; private: + // Layout: + virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) override; // dockable windows: // object catalog (owned by Shell) ObjectCatalog& rObjectCatalog; // property browser (created by this, deleted by toolkit) VclPtr<PropBrw> pPropertyBrowser; - -private: void AddPropertyBrowser (); -private: + friend class DialogWindow; }; diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx index a32e1ffd94af..449ad0b4dc5e 100644 --- a/basctl/source/inc/basidectrlr.hxx +++ b/basctl/source/inc/basidectrlr.hxx @@ -29,7 +29,7 @@ namespace basctl class Shell; -class Controller : +class Controller final : public comphelper::OMutexAndBroadcastHelper, public comphelper::OPropertyContainer, public comphelper::OPropertyArrayUsageHelper<Controller>, @@ -58,7 +58,7 @@ public: // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; -protected: +private: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; }; diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 2d494cd8d4ee..e09601d65ec2 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -49,7 +49,7 @@ class TabBar; class BaseWindow; class LocalizationMgr; -class Shell : +class Shell final : public SfxViewShell, public DocumentEventListener { diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx index e2e81a26916c..cfc916867c63 100644 --- a/basctl/source/inc/bastype2.hxx +++ b/basctl/source/inc/bastype2.hxx @@ -100,7 +100,7 @@ public: LibraryLocation GetLocation() const { return m_eLocation; } }; -class LibEntry : public DocumentEntry +class LibEntry final : public DocumentEntry { private: OUString m_aLibName; @@ -171,7 +171,7 @@ public: */ -class SbTreeListBox : public DocumentEventListener +class SbTreeListBox final : public DocumentEventListener { private: std::unique_ptr<weld::TreeView> m_xControl; @@ -180,9 +180,8 @@ private: bool m_bFreezeOnFirstAddRemove; BrowseMode nMode; DocumentEventNotifier m_aNotifier; - void SetEntryBitmaps(const weld::TreeIter& rIter, const OUString& rImage); -protected: + void SetEntryBitmaps(const weld::TreeIter& rIter, const OUString& rImage); DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool); DECL_LINK(OpenCurrentHdl, weld::TreeView&, bool); void ImpCreateLibEntries(const weld::TreeIter& rShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index e6e306a73b5a..19fe8bbe8c62 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -124,9 +124,8 @@ private: // basctl::TabBar // Not to be confused with ::TabBar from svtools. -class TabBar : public ::TabBar +class TabBar final : public ::TabBar { -protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 82d3a14f605d..8948b75a56c3 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -57,7 +57,7 @@ class DialogWindowLayout; class DlgEdObj; -class DlgEdHint: public SfxHint +class DlgEdHint final : public SfxHint { public: enum Kind { @@ -92,7 +92,7 @@ class DlgEdForm; class DlgEdFactory; class DlgEdFunc; -class DlgEditor: public SfxBroadcaster +class DlgEditor final : public SfxBroadcaster { public: enum Mode { diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index 9e20f39015a8..bbb128bf3938 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -51,7 +51,7 @@ public: // DlgEdFuncInsert -class DlgEdFuncInsert : public DlgEdFunc +class DlgEdFuncInsert final : public DlgEdFunc { public: explicit DlgEdFuncInsert(DlgEditor& rParent); @@ -64,7 +64,7 @@ public: // DlgEdFuncSelect -class DlgEdFuncSelect : public DlgEdFunc +class DlgEdFuncSelect final : public DlgEdFunc { public: explicit DlgEdFuncSelect(DlgEditor& rParent); diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx index 373f38b1467a..5243153c6ee9 100644 --- a/basctl/source/inc/dlgedlist.hxx +++ b/basctl/source/inc/dlgedlist.hxx @@ -31,7 +31,7 @@ class DlgEdObj; typedef ::cppu::WeakImplHelper<css::beans::XPropertyChangeListener> PropertyChangeListenerHelper; -class DlgEdPropListenerImpl : public PropertyChangeListenerHelper +class DlgEdPropListenerImpl final : public PropertyChangeListenerHelper { private: DlgEdObj& rDlgEdObj; @@ -51,7 +51,7 @@ public: typedef ::cppu::WeakImplHelper<css::container::XContainerListener> ContainerListenerHelper; -class DlgEdEvtContListenerImpl : public ContainerListenerHelper +class DlgEdEvtContListenerImpl final : public ContainerListenerHelper { private: DlgEdObj& rDlgEdObj; diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index 24a97905b1d3..885b25f2a13a 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -25,7 +25,7 @@ namespace basctl { // DlgEdModel -class DlgEdModel : public SdrModel +class DlgEdModel final : public SdrModel { friend class DlgEdPage; diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index d5e29cf48caf..86fa02c696af 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -144,23 +144,19 @@ public: // DlgEdForm -class DlgEdForm: public DlgEdObj +class DlgEdForm final : public DlgEdObj { friend class DlgEditor; friend class DlgEdFactory; -private: DlgEditor& rDlgEditor; std::vector<DlgEdObj*> pChildren; - mutable ::std::optional< css::awt::DeviceInfo > mpDeviceInfo; -private: explicit DlgEdForm( SdrModel& rSdrModel, DlgEditor&); -protected: virtual void NbcMove( const Size& rSize ) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 195dee840344..b8c7ce88ca2c 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -31,7 +31,7 @@ class DlgEditor; // DlgEdView -class DlgEdView : public SdrView +class DlgEdView final : public SdrView { private: DlgEditor& rDlgEditor; @@ -48,7 +48,7 @@ public: virtual void MarkListHasChanged() override; virtual void MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin ) override; -protected: +private: /// override to handle HitTest for some objects specially using SdrView::CheckSingleSdrObjectHit; virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay) const override; diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 722ec60c46ac..642bdf81daf7 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -42,7 +42,7 @@ struct LanguageEntry extern bool localesAreEqual( const css::lang::Locale& rLocaleLeft, const css::lang::Locale& rLocaleRight ); -class ManageLanguageDialog : public weld::GenericDialogController +class ManageLanguageDialog final : public weld::GenericDialogController { private: std::shared_ptr<LocalizationMgr> m_xLocalizationMgr; @@ -69,7 +69,7 @@ public: virtual ~ManageLanguageDialog() override; }; -class SetDefaultLanguageDialog : public weld::GenericDialogController +class SetDefaultLanguageDialog final : public weld::GenericDialogController { private: std::shared_ptr<LocalizationMgr> m_xLocalizationMgr; diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index e5f8d65d900f..a443404e0cd6 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -34,7 +34,7 @@ enum ItemType TYPE_METHOD }; -class SbxItem : public SfxPoolItem +class SbxItem final : public SfxPoolItem { const ScriptDocument m_aDocument; const OUString m_aLibName; commit 8a4bcae71053b2db33d80036a0707edbe1ddb270 Author: Noel Grandin <[email protected]> AuthorDate: Wed Nov 3 09:49:40 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Nov 3 11:05:02 2021 +0100 loplugin:finalclasses Change-Id: I80ac98249f8ef6b24939de59e32eda4fa2e79fba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124631 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx index ca3ac088d0d0..707f2cdc8e78 100644 --- a/sd/inc/Annotation.hxx +++ b/sd/inc/Annotation.hxx @@ -73,7 +73,7 @@ struct SD_DLLPUBLIC CustomAnnotationMarker std::vector<basegfx::B2DPolygon> maPolygons; }; -class Annotation : private ::cppu::BaseMutex, +class Annotation final : private ::cppu::BaseMutex, public ::cppu::WeakComponentImplHelper<css::office::XAnnotation>, public ::cppu::PropertySetMixin<css::office::XAnnotation> { diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index eebda95f01b8..67445cf0d854 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -367,7 +367,7 @@ private: typedef std::shared_ptr< InteractiveSequence > InteractiveSequencePtr; typedef std::vector< InteractiveSequencePtr > InteractiveSequenceVector; -class SAL_DLLPUBLIC_RTTI MainSequence : public EffectSequenceHelper, public ISequenceListener +class SD_DLLPUBLIC MainSequence final : public EffectSequenceHelper, public ISequenceListener { friend class UndoAnimation; friend class MainSequenceRebuildGuard; @@ -407,7 +407,7 @@ public: virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const override; virtual CustomAnimationEffectPtr getEffectFromOffset( sal_Int32 nOffset ) const override; -protected: +private: /** permits rebuilds until unlockRebuilds() is called. All rebuild calls during a locked sequence are process after unlockRebuilds() call. lockRebuilds() and unlockRebuilds() calls can be nested. */ void lockRebuilds(); diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index 4b1a5903104a..d13d27e97c93 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -42,7 +42,7 @@ namespace accessibility @see SvxEditSource @see SvxViewForwarder */ - class AccessibleOutlineEditSource : public SvxEditSource, public SvxViewForwarder, public SfxBroadcaster, public SfxListener + class AccessibleOutlineEditSource final : public SvxEditSource, public SvxViewForwarder, public SfxBroadcaster, public SfxListener { public: /// Create an SvxEditSource interface for the given Outliner diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index e676087899d9..965bf7a276c5 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -46,7 +46,7 @@ namespace sd struct ClientInfoInternal; - class RemoteServer : public salhelper::Thread + class RemoteServer final : public salhelper::Thread { public: // Internal setup diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index ce51a5916486..2789cabee6ec 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -28,7 +28,7 @@ class OutlineViewShell; /** This class implements the OutlineViewShell specific part of the controller. */ -class SdUnoOutlineView +class SdUnoOutlineView final : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index ce45c447cb99..7ca40a1abed8 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -30,7 +30,7 @@ namespace sd { /** This class implements the SlideSorter specific part of the controller. */ -class SdUnoSlideView +class SdUnoSlideView final : private cppu::BaseMutex, public DrawSubControllerInterfaceBase { diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 91c0d4253926..64808d4343a7 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -32,7 +32,7 @@ namespace sd::slidesorter { class SlideSorter; -class SAL_DLLPUBLIC_RTTI SlideSorterViewShell +class SAL_DLLPUBLIC_RTTI SlideSorterViewShell final : public ViewShell { friend class controller::SlotManager; @@ -190,14 +190,13 @@ public: */ virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) override; -protected: +private: /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ virtual SfxUndoManager* ImpGetUndoManager() const override; -private: std::shared_ptr<SlideSorter> mpSlideSorter; bool mbIsArrangeGUIElementsPending; diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index 8db2ccb41f17..e1ca1b57b9d2 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -26,7 +26,7 @@ namespace sd /** This class exists to be able to register a factory that creates a slide sorter view shell as default. */ -class SlideSorterViewShellBase : public ImpressViewShellBase +class SlideSorterViewShellBase final : public ImpressViewShellBase { public: SFX_DECL_VIEWFACTORY(SlideSorterViewShellBase); diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index b10fef8a26c0..2b6ea8f93c8b 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -45,7 +45,7 @@ namespace impl struct TransitionEffect; } -class SlideTransitionPane : public PanelLayout +class SlideTransitionPane final : public PanelLayout , public sfx2::sidebar::ILayoutableWindow { public: diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index cacea3be5611..3d2163a7e018 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -30,7 +30,7 @@ namespace sd provides Draw and Impress specific implementations of GetNextWrongSentence() and ApplyChangedSentence(). */ -class SpellDialogChildWindow : public svx::SpellDialogChildWindow, public SfxListener +class SpellDialogChildWindow final : public svx::SpellDialogChildWindow, public SfxListener { public: SpellDialogChildWindow(vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, @@ -47,7 +47,7 @@ public: SFX_DECL_CHILDWINDOW_WITHID(SpellDialogChildWindow); -protected: +private: /** Iterate over the sentences in all text shapes and stop at the next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. @@ -61,7 +61,6 @@ protected: virtual void GetFocus() override; virtual void LoseFocus() override; -private: /** This outliner is used to do the main work of iterating over a document and finding sentences with spelling errors. */ diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 41ab8562e0a9..5e5eba7bbf09 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -78,7 +78,7 @@ private: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; // nested class to implement the TransferableHelper - class TabControlTransferable : public TransferableHelper + class TabControlTransferable final : public TransferableHelper { public: explicit TabControlTransferable( TabControl& rParent ) : diff --git a/sd/source/ui/inc/TableDesignPane.hxx b/sd/source/ui/inc/TableDesignPane.hxx index a39894b1c501..042eb6137662 100644 --- a/sd/source/ui/inc/TableDesignPane.hxx +++ b/sd/source/ui/inc/TableDesignPane.hxx @@ -48,7 +48,7 @@ enum TableCheckBox : sal_uInt16 CB_COUNT = CB_BANDED_COLUMNS + 1 }; -class TableValueSet : public ValueSet +class TableValueSet final : public ValueSet { private: bool m_bModal; @@ -94,7 +94,7 @@ private: css::uno::Reference< css::container::XIndexAccess > mxTableFamily; }; -class TableDesignPane : public PanelLayout +class TableDesignPane final : public PanelLayout , public sfx2::sidebar::ILayoutableWindow { private: diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index a9a31546af7f..034f000a6d5d 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -65,7 +65,7 @@ public: supported format) last. When a step does not add a new template then the value of the previous step is returned. */ -class TemplateScanner : public ::sd::tools::AsynchronousTask +class TemplateScanner final : public ::sd::tools::AsynchronousTask { public: /** Create a new template scanner and prepare but do not execute the scanning. diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 90d769bde8f2..61394834fbc2 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -27,7 +27,7 @@ namespace sd { class View; class ViewShell; -class TextObjectBar +class TextObjectBar final : public SfxShell { public: diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 907db7cfe090..9fa0854d80b7 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -43,7 +43,7 @@ namespace sd { namespace sd { -class TabBarControl : public InterimItemWindow +class TabBarControl final : public InterimItemWindow { public: TabBarControl(vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); @@ -69,7 +69,7 @@ typedef ::cppu::WeakComponentImplHelper < /** Tab control for switching between views in the center pane. */ -class ViewTabBar +class ViewTabBar final : private sd::MutexOwner, public ViewTabBarInterfaceBase { diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 16549338fc75..2545af79f9e9 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -48,7 +48,7 @@ namespace sd <member>RegisterWindow()</member> method. When a document is given then this document is reformatted when the monitored option changes.</p> */ -class WindowUpdater : public utl::ConfigurationListener +class WindowUpdater final : public utl::ConfigurationListener { public: explicit WindowUpdater(); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 65561ce92762..efd50e4f7206 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -31,7 +31,7 @@ class SfxStyleSheetBasePool; /** * Template-Tab-Dialog */ -class SdPresLayoutTemplateDlg : public SfxTabDialogController +class SdPresLayoutTemplateDlg final : public SfxTabDialogController { private: const SfxObjectShell* mpDocShell; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 99bb6139cc6f..51c3a3603b44 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -21,7 +21,7 @@ #include <sfx2/tabdlg.hxx> -class SdPrintOptions : public SfxTabPage +class SdPrintOptions final : public SfxTabPage { friend class SdModule; diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 22091b2c63e5..1f0b7274c668 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -47,7 +47,7 @@ template <class E> class Sequence; // Html-Export Autopilot // ********************************************************************* // should turn this into a wizard -class SdPublishingDlg : public weld::GenericDialogController +class SdPublishingDlg final : public weld::GenericDialogController { private: // page 1 controls diff --git a/sd/source/ui/inc/scalectrl.hxx b/sd/source/ui/inc/scalectrl.hxx index 96745973f6d1..2a0ed5b28e1d 100644 --- a/sd/source/ui/inc/scalectrl.hxx +++ b/sd/source/ui/inc/scalectrl.hxx @@ -21,7 +21,7 @@ #include <sfx2/stbitem.hxx> -class SdScaleControl : public SfxStatusBarControl +class SdScaleControl final : public SfxStatusBarControl { public: SdScaleControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb); @@ -32,7 +32,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); -protected: +private: virtual void Command(const CommandEvent& rCEvt) override; }; diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index a3e7eabe1da4..77187a0b3780 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -31,7 +31,7 @@ namespace sd { class DrawDocShell; } -class SdPresLayoutDlg +class SdPresLayoutDlg final : public weld::GenericDialogController { public: diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 57a98dabfb47..1d5af3bc942a 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -50,7 +50,7 @@ namespace svt { class AcceleratorExecute; } -class SdPageObjsTLVDropTarget : public DropTargetHelper +class SdPageObjsTLVDropTarget final : public DropTargetHelper { private: weld::TreeView& m_rTreeView; @@ -350,7 +350,7 @@ public: } // nested class to implement the TransferableHelper - class SAL_DLLPRIVATE SdPageObjsTransferable : public SdTransferable + class SAL_DLLPRIVATE SdPageObjsTransferable final : public SdTransferable { public: SdPageObjsTransferable( diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index 49d05061c587..466182faf422 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -25,7 +25,7 @@ #include <memory> #include <vector> -class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction +class SD_DLLPUBLIC SdUndoGroup final : public SdUndoAction { std::vector<std::unique_ptr<SdUndoAction>> aCtn; public: diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index b6d199bdda5e..926147a724b1 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -76,7 +76,7 @@ enum AnimationMode typedef ::cppu::WeakComponentImplHelper< css::presentation::XPresentation2, css::lang::XServiceInfo > SlideshowBase; -class SlideShow : private ::cppu::BaseMutex, public SlideshowBase +class SlideShow final : private ::cppu::BaseMutex, public SlideshowBase { public: /// used by the model to create a slideshow for it diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index b177078ea41f..d32388d7bdc4 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -29,7 +29,7 @@ class SdrView; /** * Template-Tab-Dialog */ -class SdTabTemplateDlg : public SfxStyleDialogController +class SdTabTemplateDlg final : public SfxStyleDialogController { private: const SfxObjectShell& rDocShell; diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 2366a8c693dc..bdf6eed86d36 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -20,7 +20,7 @@ #include <sfx2/stbitem.hxx> -class SdTemplateControl : public SfxStatusBarControl +class SdTemplateControl final : public SfxStatusBarControl { public: SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); @@ -31,10 +31,9 @@ public: SFX_DECL_STATUSBAR_CONTROL(); -protected: +private: virtual void Command( const CommandEvent& rCEvt ) override; -private: OUString msTemplate; }; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 22c4dd82a779..9b0b272c62df 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -35,7 +35,7 @@ class SdDrawDocument; /** * Effect-SingleTab-Dialog */ -class SdActionDlg : public SfxSingleTabDialogController +class SdActionDlg final : public SfxSingleTabDialogController { public: SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView); @@ -44,7 +44,7 @@ public: /** * Interaction-Tab-Page */ -class SdTPAction : public SfxTabPage +class SdTPAction final : public SfxTabPage { private: const ::sd::View* mpView; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 8844013829ef..bc101dca3490 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -25,7 +25,7 @@ /** * Option-Tab-Page: Snap */ -class SdTpOptionsSnap : public SvxGridTabPage +class SdTpOptionsSnap final : public SvxGridTabPage { public: SdTpOptionsSnap(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); @@ -39,7 +39,7 @@ public: /** * Option-Tab-Page: Contents */ -class SdTpOptionsContents : public SfxTabPage +class SdTpOptionsContents final : public SfxTabPage { private: std::unique_ptr<weld::CheckButton> m_xCbxRuler; @@ -60,7 +60,7 @@ public: * Option-Tab-Page: View */ -class SdTpOptionsMisc : public SfxTabPage +class SdTpOptionsMisc final : public SfxTabPage { friend class SdModule; @@ -116,7 +116,6 @@ private: */ void UpdateCompatibilityControls(); -protected: virtual void ActivatePage( const SfxItemSet& rSet ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; diff --git a/sd/source/ui/inc/uiobject.hxx b/sd/source/ui/inc/uiobject.hxx index 06cf98937a52..06cb6105fa9b 100644 --- a/sd/source/ui/inc/uiobject.hxx +++ b/sd/source/ui/inc/uiobject.hxx @@ -11,7 +11,7 @@ #include <vcl/uitest/uiobject.hxx> #include "Window.hxx" -class ImpressWindowUIObject : public WindowUIObject +class ImpressWindowUIObject final : public WindowUIObject { public: ImpressWindowUIObject(const VclPtr<sd::Window>& xWindow); @@ -26,10 +26,9 @@ public: static std::unique_ptr<UIObject> create(vcl::Window* pWindow); -protected: +private: virtual OUString get_name() const override; -private: VclPtr<sd::Window> mxWindow; }; diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index b33b53ff8a1a..7c3845f8bd0c 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -29,7 +29,7 @@ class SfxItemSet; class SfxStyleSheet; class SdDrawDocument; -class StyleSheetUndoAction : public SdUndoAction +class StyleSheetUndoAction final : public SdUndoAction { SfxStyleSheet* mpStyleSheet; diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index acc261f6d93d..afbb13eca461 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -30,7 +30,7 @@ class SdPage; class SfxItemSet; class SfxPoolItem; -class SdBackgroundObjUndoAction : public SdUndoAction +class SdBackgroundObjUndoAction final : public SdUndoAction { private: diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index 709f71aa838f..2c8c9c8e9938 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -27,7 +27,7 @@ class SdDrawDocument; /************************************************************************/ -class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction +class SD_DLLPUBLIC SdHeaderFooterUndoAction final : public SdUndoAction { SdPage* mpPage; diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index 9391cbcfc17b..431f60d4f632 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -26,7 +26,7 @@ class SdrLayer; /************************************************************************/ -class SdLayerModifyUndoAction : public SdUndoAction +class SdLayerModifyUndoAction final : public SdUndoAction { public: diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index cbae3d06f289..87d5b5b21748 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -29,7 +29,7 @@ class SdPage; /************************************************************************/ -class SdPageFormatUndoAction : public SdUndoAction +class SdPageFormatUndoAction final : public SdUndoAction { SdPage* mpPage; @@ -104,7 +104,7 @@ public: /************************************************************************/ -class SdPageLRUndoAction : public SdUndoAction +class SdPageLRUndoAction final : public SdUndoAction { SdPage* mpPage; @@ -132,7 +132,7 @@ public: /************************************************************************/ -class SdPageULUndoAction : public SdUndoAction +class SdPageULUndoAction final : public SdUndoAction { SdPage* mpPage; diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index f9af2c02cb97..9248642bf377 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -26,7 +26,7 @@ class SdDrawDocument; class SdPage; -class ModifyPageUndoAction : public SdUndoAction +class ModifyPageUndoAction final : public SdUndoAction { SdPage* mpPage; OUString maOldName; @@ -52,7 +52,7 @@ public: virtual void Redo() override; }; -class RenameLayoutTemplateUndoAction : public SdUndoAction +class RenameLayoutTemplateUndoAction final : public SdUndoAction { public: RenameLayoutTemplateUndoAction( diff --git a/sd/source/ui/inc/unmovss.hxx b/sd/source/ui/inc/unmovss.hxx index 9cff0e4510ee..93e87cd407b2 100644 --- a/sd/source/ui/inc/unmovss.hxx +++ b/sd/source/ui/inc/unmovss.hxx @@ -25,7 +25,7 @@ class SdDrawDocument; -class SdMoveStyleSheetsUndoAction : public SdUndoAction +class SdMoveStyleSheetsUndoAction final : public SdUndoAction { StyleSheetCopyResultVector maStyles; std::vector< SdStyleSheetVector > maListOfChildLists; diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 80bd26d8c153..9ad32766842a 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -28,7 +28,7 @@ class SdDrawDocument; class SdrObject; -class SdAnimationPrmsUndoAction : public SdUndoAction +class SdAnimationPrmsUndoAction final : public SdUndoAction { SdrObject* pObject; bool bOldActive; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 86b1f7a854e0..62545ec2f0c4 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -368,7 +368,7 @@ public: * * ***********************************************************************/ -class SdDocLinkTargets : public ::cppu::WeakImplHelper< css::container::XNameAccess, +class SdDocLinkTargets final : public ::cppu::WeakImplHelper< css::container::XNameAccess, css::lang::XServiceInfo , css::lang::XComponent > { private: diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index a95cbc80d868..993a6634cc68 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -270,7 +270,7 @@ public: * * ***********************************************************************/ -class SdPageLinkTargets : public ::cppu::WeakImplHelper< css::container::XNameAccess, +class SdPageLinkTargets final : public ::cppu::WeakImplHelper< css::container::XNameAccess, css::lang::XServiceInfo > { private: diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 2f1df481e9ba..6dcf681cbee6 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -71,9 +71,8 @@ public: /** this class holds the parameters and status of a search or replace operation performed by class SdUnoSearchReplaceShape */ -class SdUnoSearchReplaceDescriptor : public ::cppu::WeakImplHelper< css::lang::XUnoTunnel, css::util::XReplaceDescriptor > // public css::util::XSearchDescriptor, css::beans::XPropertySet +class SdUnoSearchReplaceDescriptor final : public ::cppu::WeakImplHelper< css::lang::XUnoTunnel, css::util::XReplaceDescriptor > // public css::util::XSearchDescriptor, css::beans::XPropertySet { -protected: std::unique_ptr<SvxItemPropertySet> mpPropSet; bool mbBackwards; diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index 8cb960db957f..8d75204f195f 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -26,7 +26,7 @@ class SdDrawDocument; class SdPage; -class SdPresentationLayoutUndoAction : public SdUndoAction +class SdPresentationLayoutUndoAction final : public SdUndoAction { OUString aOldLayoutName; OUString aNewLayoutName; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 67df42ce6707..ac7a1bfd49fe 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -32,7 +32,7 @@ class DrawDocShell; |* \******************************************************************************/ -class SdVectorizeDlg : public weld::GenericDialogController +class SdVectorizeDlg final : public weld::GenericDialogController { ::sd::DrawDocShell* m_pDocSh; Bitmap aBmp;
