diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-07 10:17:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-07 12:06:35 +0000 |
commit | d4f78fa3b61a54dca64504bd76990baf20e2313f (patch) | |
tree | 9b05eb19f939a694dc3b9db3efa31dc1d5735abb /sw | |
parent | b7914a9a566413eac55c7e115da1cb3552cd58df (diff) |
loplugin:unnecessaryvirtual in svx..sw
Change-Id: I4ae8de558550e6577c28b95e0aaed74f00d79c29
Reviewed-on: https://gerrit.libreoffice.org/30650
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/pagedesc.hxx | 4 | ||||
-rw-r--r-- | sw/inc/swcrsr.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/inc/threadmanager.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.hxx | 8 | ||||
-rw-r--r-- | sw/source/filter/xml/XMLRedlineImportHelper.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/FrameControl.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/navmgr.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/uinums.hxx | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 9e3bd2e67282..592886df9ccc 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -392,7 +392,7 @@ typedef boost::multi_index_container< > SwPageDescsBase; -class SwPageDescs +class SwPageDescs final { // function updating ByName index via modify friend bool SwPageDesc::SetName( const OUString& rNewName ); @@ -415,7 +415,7 @@ public: SwPageDescs(); // frees all SwPageDesc! - virtual ~SwPageDescs(); + ~SwPageDescs(); void clear() { return m_Array.clear(); } bool empty() const { return m_Array.empty(); } diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index b2d03e0b62a0..0f9ab9fb3f7a 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -239,7 +239,7 @@ public: }; // internal, used by SwCursor::SaveState() etc. -struct SwCursor_SavePos +struct SwCursor_SavePos final { sal_uLong nNode; sal_Int32 nContent; @@ -250,7 +250,7 @@ struct SwCursor_SavePos nContent( rCursor.GetPoint()->nContent.GetIndex() ), pNext( nullptr ) {} - virtual ~SwCursor_SavePos() {} + ~SwCursor_SavePos() {} DECL_FIXEDMEMPOOL_NEWDEL( SwCursor_SavePos ) }; diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx index 83ea7bae6b6d..51198ad08b7f 100644 --- a/sw/source/core/inc/threadmanager.hxx +++ b/sw/source/core/inc/threadmanager.hxx @@ -43,12 +43,12 @@ It assures that not more than <mnStartedSize> threads are started. */ -class ThreadManager +class ThreadManager final { public: explicit ThreadManager( css::uno::Reference< css::util::XJobManager >& rThreadJoiner ); - virtual ~ThreadManager(); + ~ThreadManager(); std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef(); void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 2a79d3c207f9..f5db223db764 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -162,7 +162,7 @@ typedef std::map<sal_uInt32, WW8TableNodeInfoInner*, class WW8TableInfo; -class WW8TableNodeInfo +class WW8TableNodeInfo final { public: typedef std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, @@ -180,7 +180,7 @@ public: typedef std::shared_ptr<WW8TableNodeInfo> Pointer_t; WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTextNode); - virtual ~WW8TableNodeInfo(); + ~WW8TableNodeInfo(); void setDepth(sal_uInt32 nDepth); void setEndOfLine(bool bEndOfLine); @@ -289,7 +289,7 @@ public: RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo); }; -class WW8TableInfo +class WW8TableInfo final { friend class WW8TableNodeInfoInner; typedef std::unordered_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t; @@ -339,7 +339,7 @@ public: typedef std::shared_ptr<WW8TableInfo> Pointer_t; WW8TableInfo(); - virtual ~WW8TableInfo(); + ~WW8TableInfo(); void processSwTable(const SwTable * pTable); WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable, RowEndInners_t &rLastRowEnds); diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index 64d42d229056..4a30e46b3b55 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { typedef std::map< OUString, RedlineInfo* > RedlineMapType; -class XMLRedlineImportHelper +class XMLRedlineImportHelper final { const OUString sInsertion; const OUString sDeletion; @@ -65,7 +65,7 @@ public: // redline mode const css::uno::Reference<css::beans::XPropertySet> & rModel, const css::uno::Reference<css::beans::XPropertySet> & rImportInfoSet ); - virtual ~XMLRedlineImportHelper(); + ~XMLRedlineImportHelper(); // create a redline object // (The redline will be inserted into the document after both start diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index d9a968d2dd6c..9cc986b89635 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -29,13 +29,13 @@ public: virtual SwEditWin* GetEditWin() = 0; }; -class SwFrameControl +class SwFrameControl final { VclPtr<vcl::Window> mxWindow; ISwFrameControl *mpIFace; public: SwFrameControl( const VclPtr<vcl::Window> &pWindow ); - virtual ~SwFrameControl(); + ~SwFrameControl(); vcl::Window* GetWindow() { return mxWindow.get(); } diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx index 9101b0e45e1f..733fd35f6208 100644 --- a/sw/source/uibase/inc/navmgr.hxx +++ b/sw/source/uibase/inc/navmgr.hxx @@ -21,7 +21,7 @@ class SwWrtShell; struct SwPosition; class SwUnoCursor; -class SwNavigationMgr +class SwNavigationMgr final { private: /* @@ -43,7 +43,7 @@ private: public: /* Constructor that initializes the shell to the current shell */ SwNavigationMgr( SwWrtShell & rShell ); - virtual ~SwNavigationMgr() + ~SwNavigationMgr() { SolarMutexGuard g; m_entries.clear(); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 0adca712acb4..fdffc807f95d 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -59,7 +59,7 @@ class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParen typedef std::vector<std::unique_ptr<SwRedlineDataChild>> SwRedlineDataChildArr; -class SW_DLLPUBLIC SwRedlineAcceptDlg +class SW_DLLPUBLIC SwRedlineAcceptDlg final { VclPtr<vcl::Window> m_pParentDlg; std::vector<std::unique_ptr<SwRedlineDataParent>> m_RedlineParents; @@ -119,7 +119,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg public: SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false); - virtual ~SwRedlineAcceptDlg(); + ~SwRedlineAcceptDlg(); DECL_LINK( FilterChangedHdl, SvxTPFilter*, void ); diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 332957966d49..5d11b36817e9 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -78,7 +78,7 @@ public: void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const; }; -class SW_DLLPUBLIC SwChapterNumRules +class SW_DLLPUBLIC SwChapterNumRules final { public: enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms @@ -90,7 +90,7 @@ protected: public: SwChapterNumRules(); - virtual ~SwChapterNumRules(); + ~SwChapterNumRules(); inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; void CreateEmptyNumRule(sal_uInt16 nIdx); // for import |