diff options
Diffstat (limited to 'vcl')
26 files changed, 56 insertions, 67 deletions
diff --git a/vcl/inc/ContextVBox.hxx b/vcl/inc/ContextVBox.hxx index 1dc31656adb7..0f88e4f2323a 100644 --- a/vcl/inc/ContextVBox.hxx +++ b/vcl/inc/ContextVBox.hxx @@ -27,7 +27,7 @@ * This control can be used in the notebookbar .ui files */ -class ContextVBox : public VclVBox, public NotebookbarContextControl +class ContextVBox final : public VclVBox, public NotebookbarContextControl { public: explicit ContextVBox(vcl::Window* pParent); diff --git a/vcl/inc/DropdownBox.hxx b/vcl/inc/DropdownBox.hxx index 8a81788c4e66..348444489e51 100644 --- a/vcl/inc/DropdownBox.hxx +++ b/vcl/inc/DropdownBox.hxx @@ -24,7 +24,7 @@ #include "IPrioritable.hxx" #include "NotebookbarPopup.hxx" -class DropdownBox : public VclHBox, public vcl::IPrioritable +class DropdownBox final : public VclHBox, public vcl::IPrioritable { private: bool m_bInFullView; diff --git a/vcl/inc/NotebookbarPopup.hxx b/vcl/inc/NotebookbarPopup.hxx index 8d5a00cdd226..424a96ca4426 100644 --- a/vcl/inc/NotebookbarPopup.hxx +++ b/vcl/inc/NotebookbarPopup.hxx @@ -28,7 +28,7 @@ * and after close moved to the original parent */ -class NotebookbarPopup : public FloatingWindow +class NotebookbarPopup final : public FloatingWindow { private: VclPtr<VclHBox> m_pBox; diff --git a/vcl/inc/PriorityMergedHBox.hxx b/vcl/inc/PriorityMergedHBox.hxx index 548243c06f7c..fee998600bdd 100644 --- a/vcl/inc/PriorityMergedHBox.hxx +++ b/vcl/inc/PriorityMergedHBox.hxx @@ -22,7 +22,7 @@ #include "NotebookbarPopup.hxx" #include "PriorityHBox.hxx" -class PriorityMergedHBox : public PriorityHBox +class PriorityMergedHBox final : public PriorityHBox { private: VclPtr<PushButton> m_pButton; diff --git a/vcl/inc/bitmap/BitmapWriteAccess.hxx b/vcl/inc/bitmap/BitmapWriteAccess.hxx index b71166ef0b40..bc903769d679 100644 --- a/vcl/inc/bitmap/BitmapWriteAccess.hxx +++ b/vcl/inc/bitmap/BitmapWriteAccess.hxx @@ -22,7 +22,7 @@ typedef vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &Bitmap::AcquireWrite typedef vcl::ScopedBitmapAccess<BitmapWriteAccess, AlphaMask, &AlphaMask::AcquireAlphaWriteAccess> AlphaScopedWriteAccess; -class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess +class VCL_DLLPUBLIC BitmapWriteAccess final : public BitmapReadAccess { public: BitmapWriteAccess(Bitmap& rBitmap); diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 1c94fd12c30d..f9c8a8edb894 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -73,7 +73,7 @@ namespace o3tl { template<> struct typed_flags<BorderWindowTitleType> : is_typed_flags<BorderWindowTitleType, 0x001f> {}; }; -class ImplBorderWindow : public vcl::Window +class ImplBorderWindow final : public vcl::Window { friend class vcl::Window; friend class vcl::WindowOutputDevice; @@ -242,7 +242,7 @@ public: virtual void DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) override; }; -class ImplSmallBorderWindowView : public ImplBorderWindowView +class ImplSmallBorderWindowView final : public ImplBorderWindowView { VclPtr<ImplBorderWindow> mpBorderWindow; VclPtr<OutputDevice> mpOutDev; @@ -264,7 +264,7 @@ public: virtual void DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) override; }; -class ImplStdBorderWindowView : public ImplBorderWindowView +class ImplStdBorderWindowView final : public ImplBorderWindowView { ImplBorderFrameData maFrameData; diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx index 287b663b4820..6ca04b9f3111 100644 --- a/vcl/inc/impfontcharmap.hxx +++ b/vcl/inc/impfontcharmap.hxx @@ -28,7 +28,7 @@ typedef tools::SvRef<ImplFontCharMap> ImplFontCharMapRef; class CmapResult; -class ImplFontCharMap : public SvRefBase +class ImplFontCharMap final : public SvRefBase { public: explicit ImplFontCharMap( const CmapResult& ); diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index a1d5db86bd8c..2a49726608d7 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -35,7 +35,7 @@ class OutputDevice; class FontSelectPattern; class LogicalFontInstance; -class VCL_DLLPUBLIC ImplFontMetricData : public FontAttributes, public SvRefBase +class VCL_DLLPUBLIC ImplFontMetricData final : public FontAttributes, public SvRefBase { public: explicit ImplFontMetricData( const FontSelectPattern& ); diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index dfe932bb90ce..78d569d54226 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -89,7 +89,7 @@ public: } }; -class JSDialogNotifyIdle : public Idle +class JSDialogNotifyIdle final : public Idle { // used to send message VclPtr<vcl::Window> m_aNotifierWindow; @@ -183,7 +183,7 @@ public: void fire_dragEnter(const css::datatransfer::dnd::DropTargetDragEnterEvent& dtde); }; -class JSInstanceBuilder : public SalInstanceBuilder, public JSDialogSender +class JSInstanceBuilder final : public SalInstanceBuilder, public JSDialogSender { sal_uInt64 m_nWindowId; /// used in case of tab pages where dialog is not a direct top level @@ -368,7 +368,7 @@ public: } }; -class JSDialog : public JSWidget<SalInstanceDialog, ::Dialog> +class JSDialog final : public JSWidget<SalInstanceDialog, ::Dialog> { public: JSDialog(JSDialogSender* pSender, ::Dialog* pDialog, SalInstanceBuilder* pBuilder, @@ -379,7 +379,7 @@ public: virtual void response(int response) override; }; -class JSLabel : public JSWidget<SalInstanceLabel, FixedText> +class JSLabel final : public JSWidget<SalInstanceLabel, FixedText> { public: JSLabel(JSDialogSender* pSender, FixedText* pLabel, SalInstanceBuilder* pBuilder, @@ -387,14 +387,14 @@ public: virtual void set_label(const OUString& rText) override; }; -class JSButton : public JSWidget<SalInstanceButton, ::Button> +class JSButton final : public JSWidget<SalInstanceButton, ::Button> { public: JSButton(JSDialogSender* pSender, ::Button* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership); }; -class JSEntry : public JSWidget<SalInstanceEntry, ::Edit> +class JSEntry final : public JSWidget<SalInstanceEntry, ::Edit> { public: JSEntry(JSDialogSender* pSender, ::Edit* pEntry, SalInstanceBuilder* pBuilder, @@ -403,7 +403,7 @@ public: void set_text_without_notify(const OUString& rText); }; -class JSListBox : public JSWidget<SalInstanceComboBoxWithoutEdit, ::ListBox> +class JSListBox final : public JSWidget<SalInstanceComboBoxWithoutEdit, ::ListBox> { public: JSListBox(JSDialogSender* pSender, ::ListBox* pListBox, SalInstanceBuilder* pBuilder, @@ -414,7 +414,7 @@ public: virtual void set_active(int pos) override; }; -class JSComboBox : public JSWidget<SalInstanceComboBoxWithEdit, ::ComboBox> +class JSComboBox final : public JSWidget<SalInstanceComboBoxWithEdit, ::ComboBox> { public: JSComboBox(JSDialogSender* pSender, ::ComboBox* pComboBox, SalInstanceBuilder* pBuilder, @@ -426,7 +426,7 @@ public: virtual void set_active(int pos) override; }; -class JSNotebook : public JSWidget<SalInstanceNotebook, ::TabControl> +class JSNotebook final : public JSWidget<SalInstanceNotebook, ::TabControl> { public: JSNotebook(JSDialogSender* pSender, ::TabControl* pControl, SalInstanceBuilder* pBuilder, @@ -441,7 +441,7 @@ public: virtual void insert_page(const OString& rIdent, const OUString& rLabel, int nPos) override; }; -class JSSpinButton : public JSWidget<SalInstanceSpinButton, ::FormattedField> +class JSSpinButton final : public JSWidget<SalInstanceSpinButton, ::FormattedField> { public: JSSpinButton(JSDialogSender* pSender, ::FormattedField* pSpin, SalInstanceBuilder* pBuilder, @@ -450,7 +450,7 @@ public: virtual void set_value(int value) override; }; -class JSMessageDialog : public JSWidget<SalInstanceMessageDialog, ::MessageDialog> +class JSMessageDialog final : public JSWidget<SalInstanceMessageDialog, ::MessageDialog> { std::unique_ptr<JSDialogSender> m_pOwnedSender; std::unique_ptr<JSButton> m_pOK; @@ -472,7 +472,7 @@ public: virtual void response(int response) override; }; -class JSCheckButton : public JSWidget<SalInstanceCheckButton, ::CheckBox> +class JSCheckButton final : public JSWidget<SalInstanceCheckButton, ::CheckBox> { public: JSCheckButton(JSDialogSender* pSender, ::CheckBox* pCheckBox, SalInstanceBuilder* pBuilder, @@ -481,7 +481,7 @@ public: virtual void set_active(bool active) override; }; -class JSDrawingArea : public JSWidget<SalInstanceDrawingArea, VclDrawingArea> +class JSDrawingArea final : public JSWidget<SalInstanceDrawingArea, VclDrawingArea> { public: JSDrawingArea(JSDialogSender* pSender, VclDrawingArea* pDrawingArea, @@ -492,14 +492,14 @@ public: virtual void queue_draw_area(int x, int y, int width, int height) override; }; -class JSToolbar : public JSWidget<SalInstanceToolbar, ::ToolBox> +class JSToolbar final : public JSWidget<SalInstanceToolbar, ::ToolBox> { public: JSToolbar(JSDialogSender* pSender, ::ToolBox* pToolbox, SalInstanceBuilder* pBuilder, bool bTakeOwnership); }; -class JSTextView : public JSWidget<SalInstanceTextView, ::VclMultiLineEdit> +class JSTextView final : public JSWidget<SalInstanceTextView, ::VclMultiLineEdit> { public: JSTextView(JSDialogSender* pSender, ::VclMultiLineEdit* pTextView, SalInstanceBuilder* pBuilder, @@ -507,7 +507,7 @@ public: virtual void set_text(const OUString& rText) override; }; -class JSTreeView : public JSWidget<SalInstanceTreeView, ::SvTabListBox> +class JSTreeView final : public JSWidget<SalInstanceTreeView, ::SvTabListBox> { public: JSTreeView(JSDialogSender* pSender, ::SvTabListBox* pTextView, SalInstanceBuilder* pBuilder, @@ -546,7 +546,7 @@ public: void drag_end(); }; -class JSExpander : public JSWidget<SalInstanceExpander, ::VclExpander> +class JSExpander final : public JSWidget<SalInstanceExpander, ::VclExpander> { public: JSExpander(JSDialogSender* pSender, ::VclExpander* pExpander, SalInstanceBuilder* pBuilder, @@ -555,7 +555,7 @@ public: virtual void set_expanded(bool bExpand) override; }; -class JSIconView : public JSWidget<SalInstanceIconView, ::IconView> +class JSIconView final : public JSWidget<SalInstanceIconView, ::IconView> { public: JSIconView(JSDialogSender* pSender, ::IconView* pIconView, SalInstanceBuilder* pBuilder, @@ -571,7 +571,7 @@ public: virtual void unselect(int pos) override; }; -class JSRadioButton : public JSWidget<SalInstanceRadioButton, ::RadioButton> +class JSRadioButton final : public JSWidget<SalInstanceRadioButton, ::RadioButton> { public: JSRadioButton(JSDialogSender* pSender, ::RadioButton* pRadioButton, diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 95c2ed959627..29a570a17aa2 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -171,7 +171,7 @@ public: sal_Int32 FindFirstSelectable( sal_Int32 nPos, bool bForward = true ); }; -class ImplListBoxWindow : public Control, public vcl::ISearchableStringList +class ImplListBoxWindow final : public Control, public vcl::ISearchableStringList { private: std::unique_ptr<ImplEntryList> mpEntryList; ///< EntryList @@ -232,7 +232,6 @@ private: vcl::QuickSelectionEngine maQuickSelectionEngine; -protected: virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; @@ -366,14 +365,14 @@ public: using Control::ImplInitSettings; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; -protected: +private: // ISearchableStringList virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const override; virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const override; virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) override; }; -class ImplListBox : public Control +class ImplListBox final : public Control { private: VclPtr<ImplListBoxWindow> maLBWindow; @@ -388,7 +387,6 @@ private: Link<ImplListBox*,void> maScrollHdl; // because it is needed by ImplListBoxWindow itself -protected: virtual void GetFocus() override; virtual void StateChanged( StateChangedType nType ) override; @@ -494,7 +492,7 @@ public: void SetEdgeBlending(bool bNew); }; -class ImplListBoxFloatingWindow : public FloatingWindow +class ImplListBoxFloatingWindow final : public FloatingWindow { private: VclPtr<ImplListBox> mpImplLB; @@ -503,7 +501,6 @@ private: sal_Int32 mnPopupModeStartSaveSelection; bool mbAutoWidth; -protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: @@ -531,7 +528,7 @@ public: virtual void Resize() override; }; -class ImplWin : public Control +class ImplWin final : public Control { private: @@ -546,7 +543,6 @@ private: bool mbEdgeBlending : 1; void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false); -protected: virtual void FillLayoutData() const override; public: @@ -580,7 +576,7 @@ public: }; -class ImplBtn : public PushButton +class ImplBtn final : public PushButton { private: Link<void*,void> maMBDownHdl; diff --git a/vcl/inc/managedmenubutton.hxx b/vcl/inc/managedmenubutton.hxx index d6e8f29321d8..cf9b0fd9e5f5 100644 --- a/vcl/inc/managedmenubutton.hxx +++ b/vcl/inc/managedmenubutton.hxx @@ -13,7 +13,7 @@ #include <com/sun/star/awt/XPopupMenu.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> -class ManagedMenuButton : public MenuButton +class ManagedMenuButton final : public MenuButton { public: ManagedMenuButton(vcl::Window* pParent, WinBits nStyle); diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx index 4bd837f6b261..20e8c7b66084 100644 --- a/vcl/inc/messagedialog.hxx +++ b/vcl/inc/messagedialog.hxx @@ -15,7 +15,7 @@ #include <vcl/layout.hxx> #include <vcl/toolkit/fixed.hxx> -class MessageDialog : public Dialog +class MessageDialog final : public Dialog { private: VclButtonsType m_eButtonsType; diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index e4d42f4bb7c7..21aab3667d4e 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -34,7 +34,7 @@ namespace vcl { namespace vcl { - class PrintDialog : public weld::GenericDialogController + class PrintDialog final : public weld::GenericDialogController { friend class MoreOptionsDialog; public: diff --git a/vcl/inc/qt5/Qt5MainWindow.hxx b/vcl/inc/qt5/Qt5MainWindow.hxx index f1e91b489532..7eb968a63c5a 100644 --- a/vcl/inc/qt5/Qt5MainWindow.hxx +++ b/vcl/inc/qt5/Qt5MainWindow.hxx @@ -24,7 +24,7 @@ #include "Qt5Frame.hxx" -class Qt5MainWindow : public QMainWindow +class Qt5MainWindow final : public QMainWindow { Q_OBJECT diff --git a/vcl/inc/qt5/Qt5SvpGraphics.hxx b/vcl/inc/qt5/Qt5SvpGraphics.hxx index 2ea5e6ad9b09..23aa6a36f0b5 100644 --- a/vcl/inc/qt5/Qt5SvpGraphics.hxx +++ b/vcl/inc/qt5/Qt5SvpGraphics.hxx @@ -26,11 +26,10 @@ class Qt5Frame; -class VCLPLUG_QT5_PUBLIC Qt5SvpGraphics : public SvpSalGraphics, public Qt5GraphicsBase +class VCLPLUG_QT5_PUBLIC Qt5SvpGraphics final : public SvpSalGraphics, public Qt5GraphicsBase { Qt5Frame* const m_pFrame; -protected: void handleDamage(const tools::Rectangle&) override; public: diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index e8c268957ef3..4a65d22b6c58 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -133,7 +133,7 @@ public: virtual ~SalInstanceBuilder() override; }; -class SAL_DLLPUBLIC_RTTI SalInstanceMenu : public weld::Menu +class SAL_DLLPUBLIC_RTTI SalInstanceMenu final : public weld::Menu { private: VclPtr<PopupMenu> m_xMenu; @@ -1329,7 +1329,7 @@ public: virtual ~SalInstanceTextView() override; }; -struct SalInstanceTreeIter : public weld::TreeIter +struct SalInstanceTreeIter final : public weld::TreeIter { SalInstanceTreeIter(const SalInstanceTreeIter* pOrig) : iter(pOrig ? pOrig->iter : nullptr) diff --git a/vcl/inc/skia/x11/salvd.hxx b/vcl/inc/skia/x11/salvd.hxx index 47813a467a96..fec4b8080cc1 100644 --- a/vcl/inc/skia/x11/salvd.hxx +++ b/vcl/inc/skia/x11/salvd.hxx @@ -12,7 +12,7 @@ #include <salvd.hxx> -class X11SkiaSalVirtualDevice : public SalVirtualDevice +class X11SkiaSalVirtualDevice final : public SalVirtualDevice { SalDisplay* mpDisplay; std::unique_ptr<X11SalGraphics> mpGraphics; diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx index 6449355a1501..8e71d4c13015 100644 --- a/vcl/inc/unx/cpdmgr.hxx +++ b/vcl/inc/unx/cpdmgr.hxx @@ -55,7 +55,7 @@ struct CPDPrinter GDBusProxy* backend; }; -class CPDManager : public PrinterInfoManager +class CPDManager final : public PrinterInfoManager { #if ENABLE_DBUS && ENABLE_GIO GDBusConnection * m_pConnection = nullptr; diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx index 9fd153938705..36d837d558b7 100644 --- a/vcl/inc/unx/cupsmgr.hxx +++ b/vcl/inc/unx/cupsmgr.hxx @@ -35,7 +35,7 @@ struct FPtrHash { return reinterpret_cast<size_t>(pPtr); } }; -class CUPSManager : public PrinterInfoManager +class CUPSManager final : public PrinterInfoManager { std::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles; int m_nDests; diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index 625f7c828d80..16da3b75b941 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -111,7 +111,7 @@ bool FreetypeFontFace::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilit return mpFreetypeFontInfo->GetFontCapabilities(rFontCapabilities); } -class SAL_DLLPUBLIC_RTTI FreetypeFontInstance : public LogicalFontInstance +class SAL_DLLPUBLIC_RTTI FreetypeFontInstance final : public LogicalFontInstance { friend rtl::Reference<LogicalFontInstance> FreetypeFontFace::CreateFontInstance(const FontSelectPattern&) const; @@ -120,7 +120,6 @@ class SAL_DLLPUBLIC_RTTI FreetypeFontInstance : public LogicalFontInstance virtual hb_font_t* ImplInitHbFont() override; virtual bool ImplGetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const override; -protected: explicit FreetypeFontInstance(const PhysicalFontFace& rPFF, const FontSelectPattern& rFSP); public: diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index ef257c7d83b9..5ca53c368104 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -210,7 +210,7 @@ public: sal_uLong m_nTimeoutMS; }; -class DocumentFocusListener : +class DocumentFocusListener final : public ::cppu::WeakImplHelper< css::accessibility::XAccessibleEventListener > { @@ -304,7 +304,7 @@ public: class GtkSalFrame; -class GtkSalDisplay : public SalGenericDisplay +class GtkSalDisplay final : public SalGenericDisplay { GtkSalSystem* m_pSys; GdkDisplay* m_pGdkDisplay; diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 44bcec7fd5d6..c0a032863ea4 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -93,11 +93,10 @@ enum class GtkControlPart SeparatorMenuItemSeparator, }; -class GtkSalGraphics : public SvpSalGraphics +class GtkSalGraphics final : public SvpSalGraphics { GtkSalFrame * const mpFrame; -protected: #if !GTK_CHECK_VERSION(4, 0, 0) bool isNativeControlSupported(ControlType, ControlPart) override; virtual bool drawNativeControl( ControlType nType, ControlPart nPart, diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index e55cb791e90c..fa8038048271 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -29,7 +29,7 @@ class MenuItemList; class GtkSalMenuItem; -class GtkSalMenu : public SalMenu +class GtkSalMenu final : public SalMenu { private: std::vector< GtkSalMenuItem* > maItems; @@ -141,7 +141,7 @@ public: virtual void ApplyPersona() override; }; -class GtkSalMenuItem : public SalMenuItem +class GtkSalMenuItem final : public SalMenuItem { public: GtkSalMenuItem( const SalItemParams* ); diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index ea362ba0bfb9..922b9d5e271c 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -31,7 +31,7 @@ class SalDisplay; class X11SalGraphics; -class X11SalVirtualDevice : public SalVirtualDevice +class X11SalVirtualDevice final : public SalVirtualDevice { SalDisplay *pDisplay_; std::unique_ptr<X11SalGraphics> pGraphics_; diff --git a/vcl/inc/unx/x11/x11cairotextrender.hxx b/vcl/inc/unx/x11/x11cairotextrender.hxx index d40d7d850a03..1da78384d0bd 100644 --- a/vcl/inc/unx/x11/x11cairotextrender.hxx +++ b/vcl/inc/unx/x11/x11cairotextrender.hxx @@ -23,9 +23,8 @@ #include <unx/cairotextrender.hxx> #include <unx/salgdi.h> -class X11CairoTextRender : public CairoTextRender +class X11CairoTextRender final : public CairoTextRender { -protected: X11SalGraphics& mrParent; public: diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx index 13a46c27b069..c997741958d3 100644 --- a/vcl/inc/wizdlg.hxx +++ b/vcl/inc/wizdlg.hxx @@ -62,7 +62,7 @@ namespace vcl <code>n2</code>, which share at least the first <code>k</code> states (where <code>k</code> is at least 1), and an arbitrary number of other states. */ - class RoadmapWizard : public Dialog + class RoadmapWizard final : public Dialog { private: Idle maWizardLayoutIdle; @@ -84,7 +84,6 @@ namespace vcl // here (e.g. committing page data) depend on having full control over page traveling. // So use the travelXXX methods if you need to travel - protected: tools::Long LogicalCoordinateToPixel(int iCoordinate); /**sets the number of buttons which should be left-aligned. Normally, buttons are right-aligned. @@ -151,7 +150,7 @@ namespace vcl FactoryFunction GetUITestFactory() const override; - protected: + private: /// to override to create new pages VclPtr<TabPage> createPage(WizardTypes::WizardState nState); @@ -235,7 +234,6 @@ namespace vcl */ OUString getStateDisplayName(WizardTypes::WizardState nState) const; - private: DECL_LINK( OnRoadmapItemSelected, LinkParamNone*, void ); /** updates the roadmap control to show the given path, as far as possible @@ -255,10 +253,9 @@ namespace vcl void resumeTraveling( AccessGuard ); bool isTravelingSuspended() const; - protected: + private: void GetOrCreatePage(const WizardTypes::WizardState i_nState); - private: void ImplCalcSize( Size& rSize ); void ImplPosCtrls(); void ImplPosTabPage(); |