diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-08 08:13:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-08 06:57:57 +0000 |
commit | c123c528bf1550e544b29e5a22a94a0452d5f349 (patch) | |
tree | 2dd015a5fe42b6c9b95302016674f3362478d295 /include | |
parent | 62e5010e5df379a26aa85ca9fd58bf872f020c36 (diff) |
loplugin:unnecessaryvirtual in comphelper..forms
Change-Id: Iabe292e68cb84b97f207061347ed6a30309dc9fd
Reviewed-on: https://gerrit.libreoffice.org/30679
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/proparrhlp.hxx | 12 | ||||
-rw-r--r-- | include/comphelper/threadpool.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/formattedcolumnvalue.hxx | 4 | ||||
-rw-r--r-- | include/dbaccess/AsynchronousLink.hxx | 6 | ||||
-rw-r--r-- | include/editeng/Trie.hxx | 4 | ||||
-rw-r--r-- | include/editeng/acorrcfg.hxx | 4 | ||||
-rw-r--r-- | include/editeng/editview.hxx | 4 | ||||
-rw-r--r-- | include/editeng/numitem.hxx | 4 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 4 |
9 files changed, 17 insertions, 29 deletions
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx index 3584553f3996..114efda1734f 100644 --- a/include/comphelper/proparrhlp.hxx +++ b/include/comphelper/proparrhlp.hxx @@ -85,16 +85,6 @@ protected: the additional parameters of the OPropertyArrayAggregationHelper. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - - /** the return value is used for the construction of the OPropertyArrayAggregationHelper. - Beware of the lifetime of the returned object, as it has to exist 'til the last instance - of this class dies. - */ - virtual IPropertyInfoService* getInfoService() const { return nullptr; } - - /** the return value is used for the construction of the OPropertyArrayAggregationHelper. - */ - virtual sal_Int32 getFirstAggregateId() const { return DEFAULT_AGGREGATE_PROPERTY_ID; } }; template<class TYPE> @@ -145,7 +135,7 @@ template <class TYPE> inline css::uno::Sequence< css::beans::Property > aAggregateProps; fillProperties(aProps, aAggregateProps); OSL_ENSURE(aProps.getLength(), "OAggregationArrayUsageHelper::createArrayHelper : fillProperties returned nonsense !"); - return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, getInfoService(), getFirstAggregateId()); + return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, nullptr, DEFAULT_AGGREGATE_PROPERTY_ID); } } diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx index 93f6b59ee9de..7910a83ceeb7 100644 --- a/include/comphelper/threadpool.hxx +++ b/include/comphelper/threadpool.hxx @@ -36,7 +36,7 @@ public: }; /// A very basic thread pool implementation -class COMPHELPER_DLLPUBLIC ThreadPool +class COMPHELPER_DLLPUBLIC ThreadPool final { public: /// returns a pointer to a shared pool with optimal thread @@ -54,7 +54,7 @@ public: static sal_Int32 getPreferredConcurrency(); ThreadPool( sal_Int32 nWorkers ); - virtual ~ThreadPool(); + ~ThreadPool(); /// push a new task onto the work queue void pushTask( ThreadTask *pTask /* takes ownership */ ); diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 1b3598fb454e..d7f7d8ac75a9 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -38,7 +38,7 @@ namespace dbtools /** a class which helps retrieving and setting the value of a database column as formatted string. */ - class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue + class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue final { public: /** constructs an instance @@ -74,7 +74,7 @@ namespace dbtools // note that all methods of this class need to be virtual, since it's // used in a load-on-demand context in module SVX - virtual ~FormattedColumnValue(); + ~FormattedColumnValue(); void clear(); diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx index 1f19469c8504..d8ca5b1d3610 100644 --- a/include/dbaccess/AsynchronousLink.hxx +++ b/include/dbaccess/AsynchronousLink.hxx @@ -36,11 +36,9 @@ namespace dbaui event while another thread tries to delete this event in the _destructor_ of the class). */ - class OAsynchronousLink + class OAsynchronousLink final { Link<void*,void> m_aHandler; - - protected: ::osl::Mutex m_aEventSafety; ::osl::Mutex m_aDestructionSafety; ImplSVEvent * m_nEventId; @@ -50,7 +48,7 @@ namespace dbaui @param _rHandler The link to be called asynchronously */ OAsynchronousLink( const Link<void*,void>& _rHandler ); - virtual ~OAsynchronousLink(); + ~OAsynchronousLink(); bool IsRunning() const { return m_nEventId != nullptr; } diff --git a/include/editeng/Trie.hxx b/include/editeng/Trie.hxx index 4cdcdc9d8f9d..62e2ff9110e1 100644 --- a/include/editeng/Trie.hxx +++ b/include/editeng/Trie.hxx @@ -21,14 +21,14 @@ namespace editeng struct TrieNode; -class EDITENG_DLLPUBLIC Trie +class EDITENG_DLLPUBLIC Trie final { private: std::unique_ptr<TrieNode> mRoot; public: Trie(); - virtual ~Trie(); + ~Trie(); void insert(const OUString& sInputString) const; void findSuggestions(const OUString& sWordPart, std::vector<OUString>& rSuggestionList) const; diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index ee21ebc5f931..6eef0582c4c1 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -60,7 +60,7 @@ public: /*-------------------------------------------------------------------- Description: Configuration for Auto Correction --------------------------------------------------------------------*/ -class EDITENG_DLLPUBLIC SvxAutoCorrCfg +class EDITENG_DLLPUBLIC SvxAutoCorrCfg final { friend class SvxBaseAutoCorrCfg; friend class SvxSwAutoCorrCfg; @@ -111,7 +111,7 @@ public: bool IsSearchInAllCategories() const { return bSearchInAllCategories;} SvxAutoCorrCfg(); - virtual ~SvxAutoCorrCfg(); + ~SvxAutoCorrCfg(); static SvxAutoCorrCfg& Get(); }; diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 007f368e9c90..c05371d287d3 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -79,7 +79,7 @@ enum class ScrollRangeCheck }; -class EDITENG_DLLPUBLIC EditView +class EDITENG_DLLPUBLIC EditView final { friend class EditEngine; friend class ImpEditEngine; @@ -101,7 +101,7 @@ private: public: EditView( EditEngine* pEng, vcl::Window* pWindow ); - virtual ~EditView(); + ~EditView(); void SetEditEngine( EditEngine* pEditEngine ); EditEngine* GetEditEngine() const; diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index 5466ae824797..86d8b0591ede 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -235,7 +235,7 @@ enum class SvxNumRuleType END }; -class EDITENG_DLLPUBLIC SvxNumRule +class EDITENG_DLLPUBLIC SvxNumRule final { sal_uInt16 nLevelCount; // Number of supported levels SvxNumRuleFlags nFeatureFlags; // What is supported? @@ -257,7 +257,7 @@ public: = SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); SvxNumRule(const SvxNumRule& rCopy); SvxNumRule(SvStream &rStream); - virtual ~SvxNumRule(); + ~SvxNumRule(); bool operator==( const SvxNumRule& ) const; bool operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);} diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index bfe11fc53de6..cdc7cb149353 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -188,7 +188,7 @@ inline void ParaRange::Adjust() } } -class EDITENG_DLLPUBLIC OutlinerView +class EDITENG_DLLPUBLIC OutlinerView final { friend class Outliner; @@ -218,7 +218,7 @@ private: public: OutlinerView( Outliner* pOut, vcl::Window* pWindow ); - virtual ~OutlinerView(); + ~OutlinerView(); EditView& GetEditView() const { return *pEditView; } |