diff options
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 17 | ||||
-rw-r--r-- | basctl/source/basicide/bastype3.hxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/brkdlg.hxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/iderdll2.hxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/moduldlg.hxx | 9 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogcontrolshape.hxx | 3 | ||||
-rw-r--r-- | basctl/source/inc/accessibledialogwindow.hxx | 3 | ||||
-rw-r--r-- | basctl/source/inc/dlgedclip.hxx | 3 | ||||
-rw-r--r-- | basctl/source/inc/dlgedpage.hxx | 5 | ||||
-rw-r--r-- | basctl/source/inc/propbrw.hxx | 3 |
10 files changed, 17 insertions, 38 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index c325b83a22bb..b2d10b8aa205 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -69,7 +69,7 @@ class CodeCompleteWindow; OUString getTextEngineText (ExtTextEngine&); void setTextEngineText (ExtTextEngine&, OUString const&); -class EditorWindow : public vcl::Window, public SfxListener +class EditorWindow final : public vcl::Window, public SfxListener { friend class CodeCompleteListBox; private: @@ -116,7 +116,6 @@ private: void HandleProcedureCompletion(); TextSelection GetLastHighlightPortionTextSelection(); -protected: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void Resize() override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; @@ -161,9 +160,8 @@ public: }; -class BreakPointWindow : public vcl::Window +class BreakPointWindow final : public vcl::Window { -private: ModulWindow& rModulWindow; long nCurYOffset; sal_uInt16 nMarkerPos; @@ -175,7 +173,6 @@ private: void setBackgroundColor(Color aColor); -protected: virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; BreakPoint* FindBreakPoint( const Point& rMousePos ); void ShowMarker(vcl::RenderContext& rRenderContext); @@ -197,11 +194,10 @@ public: }; -class WatchTreeListBox : public SvHeaderTabListBox +class WatchTreeListBox final : public SvHeaderTabListBox { OUString aEditingRes; -protected: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) override; virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override; @@ -221,16 +217,14 @@ public: }; -class WatchWindow : public DockingWindow +class WatchWindow final : public DockingWindow { -private: OUString aWatchStr; VclPtr<ExtendedEdit> aXEdit; VclPtr<ImageButton> aRemoveWatchButton; VclPtr<WatchTreeListBox> aTreeListBox; VclPtr<HeaderBar> aHeaderBar; -protected: virtual void Resize() override; virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; @@ -270,7 +264,7 @@ public: }; -class ComplexEditorWindow : public vcl::Window +class ComplexEditorWindow final : public vcl::Window { private: VclPtr<BreakPointWindow> aBrkWindow; @@ -280,7 +274,6 @@ private: virtual void DataChanged(DataChangedEvent const & rDCEvt) override; -protected: virtual void Resize() override; DECL_LINK( ScrollHdl, ScrollBar*, void ); diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index 9305685cdb35..5d002e4ca90b 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -26,13 +26,11 @@ namespace basctl { -class ExtendedEdit : public Edit +class ExtendedEdit final : public Edit { -private: Accelerator aAcc; Link<Accelerator&,void> aAccHdl; -protected: DECL_LINK( EditAccHdl, Accelerator&, void ); DECL_LINK( ImplGetFocusHdl, Control&, void ); DECL_LINK( ImplLoseFocusHdl, Control&, void ); diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index 1a2ea84e01bd..6b3b42035f4e 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -28,9 +28,8 @@ namespace basctl { -class BreakPointDialog : public ModalDialog +class BreakPointDialog final : public ModalDialog { -private: VclPtr<ComboBox> m_pComboBox; VclPtr<OKButton> m_pOKButton; VclPtr<PushButton> m_pNewButton; @@ -41,7 +40,6 @@ private: BreakPointList & m_rOriginalBreakPointList; BreakPointList m_aModifiedBreakPointList; -protected: void CheckButtons(); DECL_LINK( CheckBoxHdl, Button*, void ); DECL_LINK( ComboBoxHighlightHdl, ComboBox&, void ); diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx index feb9e0e6b74b..124e1d98adbc 100644 --- a/basctl/source/basicide/iderdll2.hxx +++ b/basctl/source/basicide/iderdll2.hxx @@ -32,9 +32,8 @@ class SvxSearchItem; namespace basctl { -class ExtraData +class ExtraData final { -private: std::unique_ptr<SvxSearchItem> pSearchItem; LibInfo aLibInfo; @@ -47,7 +46,6 @@ private: bool bChoosingMacro; bool bShellInCriticalSection; -protected: DECL_STATIC_LINK( ExtraData, GlobalBasicBreakHdl, StarBASIC *, BasicDebugFlags ); public: diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index ee9c90cc2588..ce9de92864bc 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -91,9 +91,8 @@ public: }; -class ExtTreeListBox : public TreeListBox +class ExtTreeListBox final : public TreeListBox { -protected: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ) override; virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override; @@ -175,9 +174,8 @@ public: DECL_LINK( ActivatePageHdl, TabControl*, void ); }; -class ObjectPage: public TabPage +class ObjectPage final : public TabPage { -protected: VclPtr<ExtTreeListBox> m_pBasicBox; VclPtr<PushButton> m_pEditButton; VclPtr<PushButton> m_pNewModButton; @@ -208,9 +206,8 @@ public: }; -class LibPage: public TabPage +class LibPage final : public TabPage { -protected: VclPtr<ListBox> m_pBasicsBox; VclPtr<CheckBox> m_pLibBox; VclPtr<PushButton> m_pEditButton; diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 4830032599d3..3f2c8b63cee5 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -46,7 +46,7 @@ typedef ::cppu::ImplHelper3< css::lang::XServiceInfo, css::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE; -class AccessibleDialogControlShape : public comphelper::OAccessibleExtendedComponentHelper, +class AccessibleDialogControlShape final : public comphelper::OAccessibleExtendedComponentHelper, public AccessibleDialogControlShape_BASE { friend class AccessibleDialogWindow; @@ -60,7 +60,6 @@ private: css::awt::Rectangle m_aBounds; css::uno::Reference< css::beans::XPropertySet > m_xControlModel; -protected: bool IsFocused(); bool IsSelected(); diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 98397bb185cb..99e34ee06475 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -51,7 +51,7 @@ typedef ::cppu::ImplHelper3 < css::accessibility::XAccessibleSelection, css::lang::XServiceInfo > AccessibleDialogWindow_BASE; -class AccessibleDialogWindow : public comphelper::OAccessibleExtendedComponentHelper, +class AccessibleDialogWindow final : public comphelper::OAccessibleExtendedComponentHelper, public AccessibleDialogWindow_BASE, public SfxListener { @@ -76,7 +76,6 @@ private: DlgEditor* m_pDlgEditor; DlgEdModel* m_pDlgEdModel; -protected: void UpdateFocused(); void UpdateSelected(); void UpdateBounds(); diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index ef2f4c0fb7cb..289096721d52 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -27,14 +27,13 @@ namespace basctl { -class DlgEdTransferableImpl : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable, +class DlgEdTransferableImpl final : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable, css::datatransfer::clipboard::XClipboardOwner > { private: css::uno::Sequence< css::datatransfer::DataFlavor > m_SeqFlavors; css::uno::Sequence< css::uno::Any > m_SeqData; -protected: static bool compareDataFlavors( const css::datatransfer::DataFlavor& lFlavor, const css::datatransfer::DataFlavor& rFlavor ); public: diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index dadd89604d3c..814826e02f77 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -32,11 +32,10 @@ namespace basctl class DlgEdModel; class DlgEdForm; -class DlgEdPage : public SdrPage +class DlgEdPage final : public SdrPage { DlgEdPage& operator=(const DlgEdPage&) = delete; -private: DlgEdForm* pDlgEdForm; public: @@ -52,7 +51,7 @@ public: virtual SdrObject* SetObjectOrdNum(size_t nOldObjNum, size_t nNewObjNum) override; -protected: +private: DlgEdPage(const DlgEdPage& rSrcPage); }; diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 9e585b3b2dcd..123b477bed92 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -40,7 +40,7 @@ namespace basctl class DialogWindowLayout; -class PropBrw : public DockingWindow, public SfxListener, public SfxBroadcaster +class PropBrw final : public DockingWindow, public SfxListener, public SfxBroadcaster { private: bool m_bInitialStateChange; @@ -54,7 +54,6 @@ private: css::uno::Reference< css::frame::XModel > m_xContextDocument; -protected: SdrView* pView; virtual void Resize() override; virtual bool Close() override; |