diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-24 11:03:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-24 13:41:17 +0200 |
commit | b4c890cb65745d05f92e451bb675fc0b2c5e31dc (patch) | |
tree | e8e772bb3e7f124f6602c43289be117df662d7ea /starmath/inc | |
parent | 49b338b76020682328acbb76cacf82b7699d8891 (diff) |
loplugin:finalclasses in sfx2..svl
Change-Id: I71b78135b3d0259657438c4401340bb35ab5c6e0
Reviewed-on: https://gerrit.libreoffice.org/43742
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath/inc')
-rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 3 | ||||
-rw-r--r-- | starmath/inc/utility.hxx | 3 | ||||
-rw-r--r-- | starmath/inc/view.hxx | 76 |
3 files changed, 37 insertions, 45 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 79607eb2acf6..1b4836d8ff62 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -155,11 +155,10 @@ public: virtual void ToggleFloatingMode() override; }; -class SmElementsDockingWindowWrapper : public SfxChildWindow +class SmElementsDockingWindowWrapper final : public SfxChildWindow { SFX_DECL_CHILDWINDOW_WITHID(SmElementsDockingWindowWrapper); -protected: SmElementsDockingWindowWrapper( vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 188ffdd5d67a..a5a731577655 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -133,9 +133,8 @@ public: // SmFontPickListBox -class SmFontPickListBox : public SmFontPickList, public ListBox +class SmFontPickListBox final : public SmFontPickList, public ListBox { -protected: DECL_LINK(SelectHdl, ListBox&, void); public: diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 9667d09e30ef..ceecb0718ed2 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -42,14 +42,8 @@ class SmViewShell; class SmPrintUIOptions; class SmGraphicAccessible; -class SmGraphicWindow : public ScrollableWindow +class SmGraphicWindow final : public ScrollableWindow { - Point aFormulaDrawPos; - // old style editing pieces - tools::Rectangle aCursorRect; - bool bIsCursorVisible; - bool bIsLineVisible; - AutoTimer aCaretBlinkTimer; public: bool IsCursorVisible() const { @@ -62,35 +56,7 @@ public: } void ShowLine(bool bShow); const SmNode * SetCursorPos(sal_uInt16 nRow, sal_uInt16 nCol); -protected: - void SetIsCursorVisible(bool bVis) - { - bIsCursorVisible = bVis; - } - using Window::SetCursor; - void SetCursor(const SmNode *pNode); - void SetCursor(const tools::Rectangle &rRect); - bool IsInlineEditEnabled() const; - -private: - rtl::Reference<SmGraphicAccessible> mxAccessible; - SmViewShell* pViewShell; - sal_uInt16 nZoom; - -protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; - virtual void KeyInput(const KeyEvent& rKEvt) override; - virtual void Command(const CommandEvent& rCEvt) override; - virtual void StateChanged( StateChangedType eChanged ) override; - -private: - void RepaintViewShellDoc(); - DECL_LINK(CaretBlinkTimerHdl, Timer *, void); - void CaretBlinkInit(); - void CaretBlinkStart(); - void CaretBlinkStop(); -public: explicit SmGraphicWindow(SmViewShell* pShell); virtual ~SmGraphicWindow() override; virtual void dispose() override; @@ -133,11 +99,41 @@ public: { return mxAccessible.get(); } + +private: + void SetIsCursorVisible(bool bVis) + { + bIsCursorVisible = bVis; + } + using Window::SetCursor; + void SetCursor(const SmNode *pNode); + void SetCursor(const tools::Rectangle &rRect); + bool IsInlineEditEnabled() const; + + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; + virtual void KeyInput(const KeyEvent& rKEvt) override; + virtual void Command(const CommandEvent& rCEvt) override; + virtual void StateChanged( StateChangedType eChanged ) override; + + void RepaintViewShellDoc(); + DECL_LINK(CaretBlinkTimerHdl, Timer *, void); + void CaretBlinkInit(); + void CaretBlinkStart(); + void CaretBlinkStop(); + + Point aFormulaDrawPos; + // old style editing pieces + tools::Rectangle aCursorRect; + bool bIsCursorVisible; + bool bIsLineVisible; + AutoTimer aCaretBlinkTimer; + rtl::Reference<SmGraphicAccessible> mxAccessible; + SmViewShell* pViewShell; + sal_uInt16 nZoom; }; -class SmGraphicController: public SfxControllerItem +class SmGraphicController final : public SfxControllerItem { -protected: SmGraphicWindow &rGraphic; public: SmGraphicController(SmGraphicWindow &, sal_uInt16, SfxBindings & ); @@ -146,9 +142,8 @@ public: const SfxPoolItem* pState) override; }; -class SmEditController: public SfxControllerItem +class SmEditController final : public SfxControllerItem { -protected: SmEditWindow &rEdit; public: @@ -198,11 +193,10 @@ public: SmViewShell* GetView(); }; -class SmCmdBoxWrapper : public SfxChildWindow +class SmCmdBoxWrapper final : public SfxChildWindow { SFX_DECL_CHILDWINDOW_WITHID(SmCmdBoxWrapper); -protected: SmCmdBoxWrapper(vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); public: |