Kaydet (Commit) d4f78fa3 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unnecessaryvirtual in svx..sw

Change-Id: I4ae8de558550e6577c28b95e0aaed74f00d79c29
Reviewed-on: https://gerrit.libreoffice.org/30650Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst b7914a9a
...@@ -106,7 +106,7 @@ namespace accessibility ...@@ -106,7 +106,7 @@ namespace accessibility
@see SvxViewForwarder @see SvxViewForwarder
@see SvxEditViewForwarder @see SvxEditViewForwarder
*/ */
class SVX_DLLPUBLIC AccessibleTextHelper class SVX_DLLPUBLIC AccessibleTextHelper final
{ {
public: public:
...@@ -124,7 +124,7 @@ namespace accessibility ...@@ -124,7 +124,7 @@ namespace accessibility
*/ */
explicit AccessibleTextHelper( ::std::unique_ptr< SvxEditSource > && pEditSource ); explicit AccessibleTextHelper( ::std::unique_ptr< SvxEditSource > && pEditSource );
virtual ~AccessibleTextHelper(); ~AccessibleTextHelper();
protected: protected:
......
...@@ -75,7 +75,7 @@ struct ShapeTypeDescriptor ...@@ -75,7 +75,7 @@ struct ShapeTypeDescriptor
service names of shapes and associated enum values and to create new service names of shapes and associated enum values and to create new
accessible objects for given shapes. accessible objects for given shapes.
*/ */
class SVX_DLLPUBLIC ShapeTypeHandler class SVX_DLLPUBLIC ShapeTypeHandler final
{ {
public: public:
enum { UNKNOWN_SHAPE_TYPE = 0 }; enum { UNKNOWN_SHAPE_TYPE = 0 };
...@@ -151,7 +151,7 @@ protected: ...@@ -151,7 +151,7 @@ protected:
/** This destructor is never called at the moment. But because this /** This destructor is never called at the moment. But because this
class is a singleton this is not a problem. class is a singleton this is not a problem.
*/ */
virtual ~ShapeTypeHandler(); ~ShapeTypeHandler();
private: private:
/// Pointer to the only instance of this class. /// Pointer to the only instance of this class.
......
...@@ -144,7 +144,7 @@ namespace svxform { ...@@ -144,7 +144,7 @@ namespace svxform {
typedef std::vector< css::uno::Reference< css::uno::XInterface> > InterfaceArray; 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; friend class FmSearchThread;
...@@ -275,7 +275,7 @@ public: ...@@ -275,7 +275,7 @@ public:
const OUString& strVisibleFields, const OUString& strVisibleFields,
const InterfaceArray& arrFields); 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 /** the link will be called on every record and after the completion of the search, the parameter is a pointer to
a FmSearchProgress structure a FmSearchProgress structure
......
...@@ -51,7 +51,7 @@ struct OrientationHelper_Impl; ...@@ -51,7 +51,7 @@ struct OrientationHelper_Impl;
direct modifications of the "Stacked text" check box. Otherwise the update direct modifications of the "Stacked text" check box. Otherwise the update
mechanism of registered controls will not work. mechanism of registered controls will not work.
*/ */
class SVX_DLLPUBLIC OrientationHelper class SVX_DLLPUBLIC OrientationHelper final
{ {
public: public:
/** @param rNfRotation A numeric field that will be connected to the DialControl. */ /** @param rNfRotation A numeric field that will be connected to the DialControl. */
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
NumericField& rNfRotation, NumericField& rNfRotation,
CheckBox& rCbStacked ); CheckBox& rCbStacked );
virtual ~OrientationHelper(); ~OrientationHelper();
/** Registers the passed window to be enabled/disabled on call of Enable(). /** Registers the passed window to be enabled/disabled on call of Enable().
@param eDisableIfStacked @param eDisableIfStacked
......
...@@ -28,7 +28,7 @@ namespace sdr ...@@ -28,7 +28,7 @@ namespace sdr
{ {
namespace contact namespace contact
{ {
class SVX_DLLPUBLIC DisplayInfo class SVX_DLLPUBLIC DisplayInfo final
{ {
protected: protected:
// The Layers which shall be processed (visible) // The Layers which shall be processed (visible)
...@@ -69,7 +69,7 @@ namespace sdr ...@@ -69,7 +69,7 @@ namespace sdr
DisplayInfo(); DisplayInfo();
// destructor // destructor
virtual ~DisplayInfo(); ~DisplayInfo();
// access to ProcessLayers // access to ProcessLayers
void SetProcessLayers(const SetOfByte& rSet); void SetProcessLayers(const SetOfByte& rSet);
......
...@@ -32,7 +32,7 @@ class SfxItemPool; ...@@ -32,7 +32,7 @@ class SfxItemPool;
class SvStream; class SvStream;
class SVX_DLLPUBLIC XFillExchangeData class SVX_DLLPUBLIC XFillExchangeData final
{ {
private: private:
XFillAttrSetItem* pXFillAttrSetItem; XFillAttrSetItem* pXFillAttrSetItem;
...@@ -40,7 +40,7 @@ private: ...@@ -40,7 +40,7 @@ private:
public: public:
XFillExchangeData(const XFillAttrSetItem& rXFillAttrSetItem); XFillExchangeData(const XFillAttrSetItem& rXFillAttrSetItem);
virtual ~XFillExchangeData(); ~XFillExchangeData();
XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData ); XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData );
......
...@@ -190,14 +190,14 @@ public: ...@@ -190,14 +190,14 @@ public:
typedef ::std::vector< FmEntryData* > FmEntryDataBaseList; typedef ::std::vector< FmEntryData* > FmEntryDataBaseList;
class FmEntryDataList class FmEntryDataList final
{ {
private: private:
FmEntryDataBaseList maEntryDataList; FmEntryDataBaseList maEntryDataList;
public: public:
FmEntryDataList(); FmEntryDataList();
virtual ~FmEntryDataList(); ~FmEntryDataList();
FmEntryData* at( size_t Index ) FmEntryData* at( size_t Index )
{ return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : nullptr; } { return ( Index < maEntryDataList.size() ) ? maEntryDataList[ Index ] : nullptr; }
......
...@@ -18,7 +18,7 @@ class SdrObjUserDataList; ...@@ -18,7 +18,7 @@ class SdrObjUserDataList;
class SdrGluePointList; class SdrGluePointList;
// Bitsack for DrawObjects // Bitsack for DrawObjects
class SdrObjPlusData class SdrObjPlusData final
{ {
friend class SdrObject; friend class SdrObject;
...@@ -34,7 +34,7 @@ class SdrObjPlusData ...@@ -34,7 +34,7 @@ class SdrObjPlusData
public: public:
SdrObjPlusData(); SdrObjPlusData();
virtual ~SdrObjPlusData(); ~SdrObjPlusData();
SdrObjPlusData* Clone(SdrObject* pObj1) const; SdrObjPlusData* Clone(SdrObject* pObj1) const;
void SetGluePoints(const SdrGluePointList& rPts); void SetGluePoints(const SdrGluePointList& rPts);
......
...@@ -52,11 +52,11 @@ typedef std::vector< BorderLineVector > BorderLineMap; ...@@ -52,11 +52,11 @@ typedef std::vector< BorderLineVector > BorderLineMap;
// TableModel // TableModel
class TableLayouter class TableLayouter final
{ {
public: public:
explicit TableLayouter( const TableModelRef& xTableModel ); explicit TableLayouter( const TableModelRef& xTableModel );
virtual ~TableLayouter(); ~TableLayouter();
/** try to fit the table into the given rectangle. /** try to fit the table into the given rectangle.
If the rectangle is to small, it will be grown to fit the table. If the rectangle is to small, it will be grown to fit the table.
......
...@@ -36,13 +36,13 @@ namespace textconversiondlgs ...@@ -36,13 +36,13 @@ namespace textconversiondlgs
{ {
struct DictionaryEntry struct DictionaryEntry final
{ {
DictionaryEntry( const OUString& rTerm, const OUString& rMapping DictionaryEntry( const OUString& rTerm, const OUString& rMapping
, sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType , sal_Int16 nConversionPropertyType //linguistic2::ConversionPropertyType
, bool bNewEntry = false ); , bool bNewEntry = false );
virtual ~DictionaryEntry(); ~DictionaryEntry();
OUString m_aTerm; OUString m_aTerm;
OUString m_aMapping; OUString m_aMapping;
......
...@@ -392,7 +392,7 @@ typedef boost::multi_index_container< ...@@ -392,7 +392,7 @@ typedef boost::multi_index_container<
> >
SwPageDescsBase; SwPageDescsBase;
class SwPageDescs class SwPageDescs final
{ {
// function updating ByName index via modify // function updating ByName index via modify
friend bool SwPageDesc::SetName( const OUString& rNewName ); friend bool SwPageDesc::SetName( const OUString& rNewName );
...@@ -415,7 +415,7 @@ public: ...@@ -415,7 +415,7 @@ public:
SwPageDescs(); SwPageDescs();
// frees all SwPageDesc! // frees all SwPageDesc!
virtual ~SwPageDescs(); ~SwPageDescs();
void clear() { return m_Array.clear(); } void clear() { return m_Array.clear(); }
bool empty() const { return m_Array.empty(); } bool empty() const { return m_Array.empty(); }
......
...@@ -239,7 +239,7 @@ public: ...@@ -239,7 +239,7 @@ public:
}; };
// internal, used by SwCursor::SaveState() etc. // internal, used by SwCursor::SaveState() etc.
struct SwCursor_SavePos struct SwCursor_SavePos final
{ {
sal_uLong nNode; sal_uLong nNode;
sal_Int32 nContent; sal_Int32 nContent;
...@@ -250,7 +250,7 @@ struct SwCursor_SavePos ...@@ -250,7 +250,7 @@ struct SwCursor_SavePos
nContent( rCursor.GetPoint()->nContent.GetIndex() ), nContent( rCursor.GetPoint()->nContent.GetIndex() ),
pNext( nullptr ) pNext( nullptr )
{} {}
virtual ~SwCursor_SavePos() {} ~SwCursor_SavePos() {}
DECL_FIXEDMEMPOOL_NEWDEL( SwCursor_SavePos ) DECL_FIXEDMEMPOOL_NEWDEL( SwCursor_SavePos )
}; };
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
It assures that not more than <mnStartedSize> threads It assures that not more than <mnStartedSize> threads
are started. are started.
*/ */
class ThreadManager class ThreadManager final
{ {
public: public:
explicit ThreadManager( css::uno::Reference< css::util::XJobManager >& rThreadJoiner ); explicit ThreadManager( css::uno::Reference< css::util::XJobManager >& rThreadJoiner );
virtual ~ThreadManager(); ~ThreadManager();
std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef(); std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID ); void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID );
......
...@@ -162,7 +162,7 @@ typedef std::map<sal_uInt32, WW8TableNodeInfoInner*, ...@@ -162,7 +162,7 @@ typedef std::map<sal_uInt32, WW8TableNodeInfoInner*,
class WW8TableInfo; class WW8TableInfo;
class WW8TableNodeInfo class WW8TableNodeInfo final
{ {
public: public:
typedef std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, typedef std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
...@@ -180,7 +180,7 @@ public: ...@@ -180,7 +180,7 @@ public:
typedef std::shared_ptr<WW8TableNodeInfo> Pointer_t; typedef std::shared_ptr<WW8TableNodeInfo> Pointer_t;
WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTextNode); WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTextNode);
virtual ~WW8TableNodeInfo(); ~WW8TableNodeInfo();
void setDepth(sal_uInt32 nDepth); void setDepth(sal_uInt32 nDepth);
void setEndOfLine(bool bEndOfLine); void setEndOfLine(bool bEndOfLine);
...@@ -289,7 +289,7 @@ public: ...@@ -289,7 +289,7 @@ public:
RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo); RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo);
}; };
class WW8TableInfo class WW8TableInfo final
{ {
friend class WW8TableNodeInfoInner; friend class WW8TableNodeInfoInner;
typedef std::unordered_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t; typedef std::unordered_map<const SwNode *, WW8TableNodeInfo::Pointer_t, hashNode > Map_t;
...@@ -339,7 +339,7 @@ public: ...@@ -339,7 +339,7 @@ public:
typedef std::shared_ptr<WW8TableInfo> Pointer_t; typedef std::shared_ptr<WW8TableInfo> Pointer_t;
WW8TableInfo(); WW8TableInfo();
virtual ~WW8TableInfo(); ~WW8TableInfo();
void processSwTable(const SwTable * pTable); void processSwTable(const SwTable * pTable);
WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable, RowEndInners_t &rLastRowEnds); WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable, RowEndInners_t &rLastRowEnds);
......
...@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { ...@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
typedef std::map< OUString, RedlineInfo* > RedlineMapType; typedef std::map< OUString, RedlineInfo* > RedlineMapType;
class XMLRedlineImportHelper class XMLRedlineImportHelper final
{ {
const OUString sInsertion; const OUString sInsertion;
const OUString sDeletion; const OUString sDeletion;
...@@ -65,7 +65,7 @@ public: ...@@ -65,7 +65,7 @@ public:
// redline mode // redline mode
const css::uno::Reference<css::beans::XPropertySet> & rModel, const css::uno::Reference<css::beans::XPropertySet> & rModel,
const css::uno::Reference<css::beans::XPropertySet> & rImportInfoSet ); const css::uno::Reference<css::beans::XPropertySet> & rImportInfoSet );
virtual ~XMLRedlineImportHelper(); ~XMLRedlineImportHelper();
// create a redline object // create a redline object
// (The redline will be inserted into the document after both start // (The redline will be inserted into the document after both start
......
...@@ -29,13 +29,13 @@ public: ...@@ -29,13 +29,13 @@ public:
virtual SwEditWin* GetEditWin() = 0; virtual SwEditWin* GetEditWin() = 0;
}; };
class SwFrameControl class SwFrameControl final
{ {
VclPtr<vcl::Window> mxWindow; VclPtr<vcl::Window> mxWindow;
ISwFrameControl *mpIFace; ISwFrameControl *mpIFace;
public: public:
SwFrameControl( const VclPtr<vcl::Window> &pWindow ); SwFrameControl( const VclPtr<vcl::Window> &pWindow );
virtual ~SwFrameControl(); ~SwFrameControl();
vcl::Window* GetWindow() { return mxWindow.get(); } vcl::Window* GetWindow() { return mxWindow.get(); }
......
...@@ -21,7 +21,7 @@ class SwWrtShell; ...@@ -21,7 +21,7 @@ class SwWrtShell;
struct SwPosition; struct SwPosition;
class SwUnoCursor; class SwUnoCursor;
class SwNavigationMgr class SwNavigationMgr final
{ {
private: private:
/* /*
...@@ -43,7 +43,7 @@ private: ...@@ -43,7 +43,7 @@ private:
public: public:
/* Constructor that initializes the shell to the current shell */ /* Constructor that initializes the shell to the current shell */
SwNavigationMgr( SwWrtShell & rShell ); SwNavigationMgr( SwWrtShell & rShell );
virtual ~SwNavigationMgr() ~SwNavigationMgr()
{ {
SolarMutexGuard g; SolarMutexGuard g;
m_entries.clear(); m_entries.clear();
......
...@@ -59,7 +59,7 @@ class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParen ...@@ -59,7 +59,7 @@ class SwRedlineDataParentSortArr : public o3tl::sorted_vector<SwRedlineDataParen
typedef std::vector<std::unique_ptr<SwRedlineDataChild>> SwRedlineDataChildArr; typedef std::vector<std::unique_ptr<SwRedlineDataChild>> SwRedlineDataChildArr;
class SW_DLLPUBLIC SwRedlineAcceptDlg class SW_DLLPUBLIC SwRedlineAcceptDlg final
{ {
VclPtr<vcl::Window> m_pParentDlg; VclPtr<vcl::Window> m_pParentDlg;
std::vector<std::unique_ptr<SwRedlineDataParent>> m_RedlineParents; std::vector<std::unique_ptr<SwRedlineDataParent>> m_RedlineParents;
...@@ -119,7 +119,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg ...@@ -119,7 +119,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
public: public:
SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false); SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false);
virtual ~SwRedlineAcceptDlg(); ~SwRedlineAcceptDlg();
DECL_LINK( FilterChangedHdl, SvxTPFilter*, void ); DECL_LINK( FilterChangedHdl, SvxTPFilter*, void );
......
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const; void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const;
}; };
class SW_DLLPUBLIC SwChapterNumRules class SW_DLLPUBLIC SwChapterNumRules final
{ {
public: public:
enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms
...@@ -90,7 +90,7 @@ protected: ...@@ -90,7 +90,7 @@ protected:
public: public:
SwChapterNumRules(); SwChapterNumRules();
virtual ~SwChapterNumRules(); ~SwChapterNumRules();
inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const;
void CreateEmptyNumRule(sal_uInt16 nIdx); // for import void CreateEmptyNumRule(sal_uInt16 nIdx); // for import
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment