diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-07 15:49:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-08 06:11:28 +0000 |
commit | 525a45f22f591d8046ca95af3073ed27fd283ef0 (patch) | |
tree | d06550b02fdc6d33c5df7c5aa7b223a7df7ae328 /framework | |
parent | 990102be61a47a14a73a25ee320ac1033250777e (diff) |
loplugin:unnecessaryvirtual in framework
Change-Id: I893bf955e45e661e3ec440dbd530fca22931c23b
Reviewed-on: https://gerrit.libreoffice.org/30666
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/classes/framecontainer.hxx | 4 | ||||
-rw-r--r-- | framework/inc/classes/protocolhandlercache.hxx | 4 | ||||
-rw-r--r-- | framework/inc/classes/taskcreator.hxx | 7 | ||||
-rw-r--r-- | framework/inc/jobs/configaccess.hxx | 4 | ||||
-rw-r--r-- | framework/inc/jobs/jobdata.hxx | 4 | ||||
-rw-r--r-- | framework/inc/jobs/jobresult.hxx | 4 | ||||
-rw-r--r-- | framework/inc/xml/acceleratorconfigurationwriter.hxx | 4 | ||||
-rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 4 | ||||
-rw-r--r-- | framework/inc/xml/menudocumenthandler.hxx | 4 | ||||
-rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 4 | ||||
-rw-r--r-- | framework/inc/xml/toolboxdocumenthandler.hxx | 8 | ||||
-rw-r--r-- | framework/inc/xml/xmlnamespaces.hxx | 4 | ||||
-rw-r--r-- | framework/source/accelerators/presethandler.cxx | 6 | ||||
-rw-r--r-- | framework/source/inc/accelerators/storageholder.hxx | 4 | ||||
-rw-r--r-- | framework/source/inc/dispatch/windowcommanddispatch.hxx | 4 | ||||
-rw-r--r-- | framework/source/inc/loadenv/actionlockguard.hxx | 4 |
16 files changed, 34 insertions, 39 deletions
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 838d1e1dfd1a..75cf8eebbfa4 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -52,7 +52,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XFrame > > TFrameContai @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ -class FrameContainer +class FrameContainer final { // member @@ -70,7 +70,7 @@ class FrameContainer /// constructor / destructor FrameContainer(); - virtual ~FrameContainer(); + ~FrameContainer(); /// add/remove/mark container items void append ( const css::uno::Reference< css::frame::XFrame >& xFrame ); diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 69e9c9217b58..3c755616553d 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -87,7 +87,7 @@ typedef std::unordered_map<OUString, ProtocolHandler, OUStringHash> HandlerHash; */ class HandlerCFGAccess; -class FWI_DLLPUBLIC HandlerCache +class FWI_DLLPUBLIC HandlerCache final { /* member */ private: @@ -105,7 +105,7 @@ class FWI_DLLPUBLIC HandlerCache public: HandlerCache(); - virtual ~HandlerCache(); + ~HandlerCache(); bool search( const OUString& sURL, ProtocolHandler* pReturn ) const; bool search( const css::util::URL& aURL, ProtocolHandler* pReturn ) const; diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index e67a71c83a07..e5d9916e9564 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -39,7 +39,7 @@ namespace framework{ @devstatus ready to use @threadsafe yes */ -class TaskCreator +class TaskCreator final { // member @@ -51,13 +51,10 @@ class TaskCreator public: TaskCreator( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~TaskCreator( ); + ~TaskCreator( ); css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName ); - // helper - private: - }; // class TaskCreator } // namespace framework diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 9318afe236d2..116d563758c8 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -36,7 +36,7 @@ namespace framework{ instead of using soecialize config items of the svtools project. This class can wrapp such configuration access. */ -class FWI_DLLPUBLIC ConfigAccess +class FWI_DLLPUBLIC ConfigAccess final { public: @@ -78,7 +78,7 @@ class FWI_DLLPUBLIC ConfigAccess ConfigAccess( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sRoot ); - virtual ~ConfigAccess(); + ~ConfigAccess(); void open ( EOpenMode eMode ); void close ( ); diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index a6bd78d7f29d..08ab0e1d97c9 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -41,7 +41,7 @@ namespace framework{ (or proxy) for all config data of a registered job. But it doesn't implement any execute functionality! */ -class JobData +class JobData final { public: @@ -180,7 +180,7 @@ class JobData JobData( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); JobData( const JobData& rCopy ); - virtual ~JobData( ); + ~JobData( ); JobData& operator=( const JobData& rCopy ); diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index 3b5c4875acf9..0d399c461ae5 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -36,7 +36,7 @@ namespace framework{ data from the code place where the job was finished to the outside code, where e.g. listener must be notified. */ -class JobResult +class JobResult final { // types @@ -107,7 +107,7 @@ class JobResult JobResult( ); JobResult( const css::uno::Any& aResult ); JobResult( const JobResult& rCopy ); - virtual ~JobResult( ); + ~JobResult( ); JobResult& operator=( const JobResult& rCopy ); diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index e71c8893acf9..503c7b04cc72 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -28,7 +28,7 @@ namespace framework{ -class AcceleratorConfigurationWriter +class AcceleratorConfigurationWriter final { // member @@ -60,7 +60,7 @@ class AcceleratorConfigurationWriter const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig ); /** @short does nothing real ... */ - virtual ~AcceleratorConfigurationWriter(); + ~AcceleratorConfigurationWriter(); /** @short TODO */ void flush(); diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 8527642cab11..a3002c02bdbe 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -130,14 +130,14 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax: css::uno::Reference< css::xml::sax::XLocator > m_xLocator; }; -class OWriteImagesDocumentHandler +class OWriteImagesDocumentHandler final { public: OWriteImagesDocumentHandler( const ImageListsDescriptor& aItems, css::uno::Reference< css::xml::sax::XDocumentHandler > const & rWriteDocumentHandler); - virtual ~OWriteImagesDocumentHandler(); + ~OWriteImagesDocumentHandler(); void WriteImagesDocument() throw ( css::xml::sax::SAXException, diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 6a1d99a5dafd..d81a00e1bdcb 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -250,14 +250,14 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase NextElementClose m_nNextElementExpected; }; // OReadMenuPopupHandler -class FWE_DLLPUBLIC OWriteMenuDocumentHandler +class FWE_DLLPUBLIC OWriteMenuDocumentHandler final { public: OWriteMenuDocumentHandler( const css::uno::Reference< css::container::XIndexAccess >& rMenuBarContainer, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rDocumentHandler, bool bIsMenuBar ); - virtual ~OWriteMenuDocumentHandler(); + ~OWriteMenuDocumentHandler(); void WriteMenuDocument() throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 0c1c3aaab854..9627f34adc5f 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -117,13 +117,13 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : css::uno::Reference< css::xml::sax::XLocator > m_xLocator; }; -class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler +class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final { public: OWriteStatusBarDocumentHandler( const css::uno::Reference< css::container::XIndexAccess >& rStatusBarItems, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rWriteDocHandler ); - virtual ~OWriteStatusBarDocumentHandler(); + ~OWriteStatusBarDocumentHandler(); void WriteStatusBarDocument() throw ( css::xml::sax::SAXException, diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 16d398679185..7b7363baf0f3 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -136,13 +136,13 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : OUString m_aCommandURL; }; -class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler +class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler final { public: OWriteToolBoxDocumentHandler( - const css::uno::Reference< css::container::XIndexAccess >& rItemAccess, - css::uno::Reference< css::xml::sax::XDocumentHandler >& rDocumentHandler ); - virtual ~OWriteToolBoxDocumentHandler(); + const css::uno::Reference< css::container::XIndexAccess >& rItemAccess, + css::uno::Reference< css::xml::sax::XDocumentHandler >& rDocumentHandler ); + ~OWriteToolBoxDocumentHandler(); void WriteToolBoxDocument() throw ( css::xml::sax::SAXException, diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index fab1dd2b8f68..c7c7f2864769 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -28,12 +28,12 @@ namespace framework { -class FWE_DLLPUBLIC XMLNamespaces +class FWE_DLLPUBLIC XMLNamespaces final { public: XMLNamespaces(); XMLNamespaces( const XMLNamespaces& ); - virtual ~XMLNamespaces(); + ~XMLNamespaces(); void addNamespace( const OUString& aName, const OUString& aValue ) throw( css::xml::sax::SAXException ); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 628cfa2df675..91668261b18c 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -54,10 +54,8 @@ namespace { @descr This struct is allegedly shared and must be used within a synchronized section. But it isn't. */ -struct TSharedStorages +struct TSharedStorages final { - public: - StorageHolder m_lStoragesShare; StorageHolder m_lStoragesUser; @@ -66,7 +64,7 @@ struct TSharedStorages , m_lStoragesUser () {}; - virtual ~TSharedStorages() {}; + ~TSharedStorages() {}; }; /** @short provides access to the: diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index ce87fb8f165f..0e5eb0c39dac 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -32,7 +32,7 @@ class XMLBasedAcceleratorConfiguration; /** TODO document me */ -class StorageHolder +class StorageHolder final { // types @@ -79,7 +79,7 @@ class StorageHolder /** @short TODO */ - virtual ~StorageHolder(); + ~StorageHolder(); /** @short TODO */ diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index d00c893f613b..c9cca2c40d90 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -46,7 +46,7 @@ namespace framework{ scenarios. On the other side VCL does not hold us alive (because it doesn't know our UNO reference). So we register at the VCL level as an event listener and */ -class WindowCommandDispatch +class WindowCommandDispatch final { private: osl::Mutex m_mutex; @@ -81,7 +81,7 @@ class WindowCommandDispatch /** @short used to free internal resources. */ - virtual ~WindowCommandDispatch(); + ~WindowCommandDispatch(); // implementation diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 2448b339e01f..417d2d4ed47f 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -31,7 +31,7 @@ namespace framework{ @descr This guard should be used to be sure, that any lock will be released. Otherwise the locked document can hinder the office on shutdown! */ -class ActionLockGuard +class ActionLockGuard final { // member @@ -64,7 +64,7 @@ class ActionLockGuard /** @short release this guard instance and make sure, that no lock will exist afterwards on the internal wrapped resource. */ - virtual ~ActionLockGuard() + ~ActionLockGuard() { unlock(); } |