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 | |
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>
-rw-r--r-- | include/svx/AccessibleTextHelper.hxx | 4 | ||||
-rw-r--r-- | include/svx/ShapeTypeHandler.hxx | 4 | ||||
-rw-r--r-- | include/svx/fmsrcimp.hxx | 4 | ||||
-rw-r--r-- | include/svx/orienthelper.hxx | 4 | ||||
-rw-r--r-- | include/svx/sdr/contact/displayinfo.hxx | 4 | ||||
-rw-r--r-- | include/svx/xexch.hxx | 4 | ||||
-rw-r--r-- | svx/source/inc/fmexpl.hxx | 4 | ||||
-rw-r--r-- | svx/source/inc/svdobjplusdata.hxx | 4 | ||||
-rw-r--r-- | svx/source/table/tablelayouter.hxx | 4 | ||||
-rw-r--r-- | svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 4 | ||||
-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 |
19 files changed, 40 insertions, 40 deletions
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 5fd8394f4161..c264585846e8 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -106,7 +106,7 @@ namespace accessibility @see SvxViewForwarder @see SvxEditViewForwarder */ - class SVX_DLLPUBLIC AccessibleTextHelper + class SVX_DLLPUBLIC AccessibleTextHelper final { public: @@ -124,7 +124,7 @@ namespace accessibility */ explicit AccessibleTextHelper( ::std::unique_ptr< SvxEditSource > && pEditSource ); - virtual ~AccessibleTextHelper(); + ~AccessibleTextHelper(); protected: diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index 796fe88c52e2..7e21e384ed93 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -75,7 +75,7 @@ struct ShapeTypeDescriptor service names of shapes and associated enum values and to create new accessible objects for given shapes. */ -class SVX_DLLPUBLIC ShapeTypeHandler +class SVX_DLLPUBLIC ShapeTypeHandler final { public: enum { UNKNOWN_SHAPE_TYPE = 0 }; @@ -151,7 +151,7 @@ protected: /** This destructor is never called at the moment. But because this class is a singleton this is not a problem. */ - virtual ~ShapeTypeHandler(); + ~ShapeTypeHandler(); private: /// Pointer to the only instance of this class. diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 200275c19bb5..478b9e1c1e84 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -144,7 +144,7 @@ namespace svxform { typedef std::vector< css::uno::Reference< css::uno::XInterface> > InterfaceArray; -class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine +class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine final { friend class FmSearchThread; @@ -275,7 +275,7 @@ public: const OUString& strVisibleFields, const InterfaceArray& arrFields); - virtual ~FmSearchEngine(); + ~FmSearchEngine(); /** the link will be called on every record and after the completion of the search, the parameter is a pointer to a FmSearchProgress structure diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 123a440956bf..baf56b67b583 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -51,7 +51,7 @@ struct OrientationHelper_Impl; direct modifications of the "Stacked text" check box. Otherwise the update mechanism of registered controls will not work. */ -class SVX_DLLPUBLIC OrientationHelper +class SVX_DLLPUBLIC OrientationHelper final { public: /** @param rNfRotation A numeric field that will be connected to the DialControl. */ @@ -60,7 +60,7 @@ public: NumericField& rNfRotation, CheckBox& rCbStacked ); - virtual ~OrientationHelper(); + ~OrientationHelper(); /** Registers the passed window to be enabled/disabled on call of Enable(). @param eDisableIfStacked diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index e489294a8f81..64d15f9564bb 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -28,7 +28,7 @@ namespace sdr { namespace contact { - class SVX_DLLPUBLIC DisplayInfo + class SVX_DLLPUBLIC DisplayInfo final { protected: // The Layers which shall be processed (visible) @@ -69,7 +69,7 @@ namespace sdr DisplayInfo(); // destructor - virtual ~DisplayInfo(); + ~DisplayInfo(); // access to ProcessLayers void SetProcessLayers(const SetOfByte& rSet); diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx index ba6b16b632b4..10844c9be5fe 100644 --- a/include/svx/xexch.hxx +++ b/include/svx/xexch.hxx @@ -32,7 +32,7 @@ class SfxItemPool; class SvStream; -class SVX_DLLPUBLIC XFillExchangeData +class SVX_DLLPUBLIC XFillExchangeData final { private: XFillAttrSetItem* pXFillAttrSetItem; @@ -40,7 +40,7 @@ private: public: XFillExchangeData(const XFillAttrSetItem& rXFillAttrSetItem); - virtual ~XFillExchangeData(); + ~XFillExchangeData(); XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData ); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 6695d6b67d92..a05a218abea7 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -190,14 +190,14 @@ public: typedef ::std::vector< FmEntryData* > FmEntryDataBaseList; -class FmEntryDataList +class FmEntryDataList final { private: FmEntryDataBaseList maEntryDataList; public: FmEntryDataList(); - virtual ~FmEntryDataList(); + ~FmEntryDataList(); FmEntryData* at( size_t Index ) { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : nullptr; } diff --git a/svx/source/inc/svdobjplusdata.hxx b/svx/source/inc/svdobjplusdata.hxx index 8f7c1a7cf99e..e36e51a6e86e 100644 --- a/svx/source/inc/svdobjplusdata.hxx +++ b/svx/source/inc/svdobjplusdata.hxx @@ -18,7 +18,7 @@ class SdrObjUserDataList; class SdrGluePointList; // Bitsack for DrawObjects -class SdrObjPlusData +class SdrObjPlusData final { friend class SdrObject; @@ -34,7 +34,7 @@ class SdrObjPlusData public: SdrObjPlusData(); - virtual ~SdrObjPlusData(); + ~SdrObjPlusData(); SdrObjPlusData* Clone(SdrObject* pObj1) const; void SetGluePoints(const SdrGluePointList& rPts); diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 5cb2e648dd65..4c00601e7a29 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -52,11 +52,11 @@ typedef std::vector< BorderLineVector > BorderLineMap; // TableModel -class TableLayouter +class TableLayouter final { public: explicit TableLayouter( const TableModelRef& xTableModel ); - virtual ~TableLayouter(); + ~TableLayouter(); /** try to fit the table into the given rectangle. If the rectangle is to small, it will be grown to fit the table. diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 4b37723a5456..3effd13b58b6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -36,13 +36,13 @@ namespace textconversiondlgs { -struct DictionaryEntry +struct DictionaryEntry final { DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType , bool bNewEntry = false ); - virtual ~DictionaryEntry(); + ~DictionaryEntry(); OUString m_aTerm; OUString m_aMapping; 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 |