summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-10-24 11:03:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-10-24 13:41:17 +0200
commitb4c890cb65745d05f92e451bb675fc0b2c5e31dc (patch)
treee8e772bb3e7f124f6602c43289be117df662d7ea /starmath
parent49b338b76020682328acbb76cacf82b7699d8891 (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')
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx3
-rw-r--r--starmath/inc/utility.hxx3
-rw-r--r--starmath/inc/view.hxx76
-rw-r--r--starmath/source/accessibility.hxx3
-rw-r--r--starmath/source/cfgitem.hxx5
-rw-r--r--starmath/source/mathmlexport.hxx3
6 files changed, 41 insertions, 52 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:
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 9f3755a7f377..e2ed62cc8dce 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -56,7 +56,7 @@ cppu::WeakImplHelper
>
SmGraphicAccessibleBaseClass;
-class SmGraphicAccessible :
+class SmGraphicAccessible final :
public SmGraphicAccessibleBaseClass
{
OUString aAccName;
@@ -68,7 +68,6 @@ class SmGraphicAccessible :
SmGraphicAccessible( const SmGraphicAccessible & ) = delete;
SmGraphicAccessible & operator = ( const SmGraphicAccessible & ) = delete;
-protected:
SmDocShell * GetDoc_Impl();
OUString GetAccessibleText_Impl();
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 3bba6bf8cfd3..fc12cfacc18b 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -92,7 +92,7 @@ public:
void SetModified( bool bVal ) { bModified = bVal; }
};
-class SmMathConfig : public utl::ConfigItem, public SfxBroadcaster
+class SmMathConfig final : public utl::ConfigItem, public SfxBroadcaster
{
std::unique_ptr<SmFormat> pFormat;
std::unique_ptr<SmCfgOther> pOther;
@@ -117,9 +117,8 @@ class SmMathConfig : public utl::ConfigItem, public SfxBroadcaster
const OUString &rSymbolName,
const OUString &rBaseNode ) const;
- void SetOtherIfNotEqual( bool &rbItem, bool bNewVal );
+ void SetOtherIfNotEqual( bool &rbItem, bool bNewVal );
-protected:
void LoadOther();
void SaveOther();
void LoadFormat();
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 62139209cce5..ba7abf51d0ce 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -63,13 +63,12 @@ public:
};
-class SmXMLExport : public SvXMLExport
+class SmXMLExport final : public SvXMLExport
{
const SmNode * pTree;
OUString aText;
bool bSuccess;
-protected:
void ExportNodes(const SmNode *pNode, int nLevel);
void ExportTable(const SmNode *pNode, int nLevel);
void ExportLine(const SmNode *pNode, int nLevel);