diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-03 15:53:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-04 07:16:25 +0000 |
commit | fc8f32adc2c940f4e35f7bd2acae5e5ff5f71971 (patch) | |
tree | bb15249ce0d3916280139b36bfcaa5e420247481 /include | |
parent | 5f77e6e9309cab4633fa8211f9788af9a9a793c9 (diff) |
loplugin:unnnecessaryvirtual in vcl
Change-Id: Ifa8bfafb2e527ce5976f3bd310d107cb2840a5f6
Reviewed-on: https://gerrit.libreoffice.org/30531
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/CommandImageResolver.hxx | 4 | ||||
-rw-r--r-- | include/vcl/GraphicNativeMetadata.hxx | 4 | ||||
-rw-r--r-- | include/vcl/GraphicNativeTransform.hxx | 4 | ||||
-rw-r--r-- | include/vcl/dockwin.hxx | 4 | ||||
-rw-r--r-- | include/vcl/gdimtf.hxx | 4 | ||||
-rw-r--r-- | include/vcl/graphicfilter.hxx | 4 | ||||
-rw-r--r-- | include/vcl/rendersettings.hxx | 5 |
7 files changed, 13 insertions, 16 deletions
diff --git a/include/vcl/CommandImageResolver.hxx b/include/vcl/CommandImageResolver.hxx index f57e79e73889..78af7b2e9336 100644 --- a/include/vcl/CommandImageResolver.hxx +++ b/include/vcl/CommandImageResolver.hxx @@ -31,7 +31,7 @@ enum class ImageType LAST = Size32, }; -class VCL_DLLPUBLIC CommandImageResolver +class VCL_DLLPUBLIC CommandImageResolver final { private: typedef std::unordered_map<OUString, OUString, OUStringHash > CommandToImageNameMap; @@ -47,7 +47,7 @@ private: public: CommandImageResolver(); - virtual ~CommandImageResolver(); + ~CommandImageResolver(); bool registerCommands(css::uno::Sequence<OUString>& aCommandSequence); Image getImageFromCommandURL(ImageType nImageType, const OUString& rCommandURL); diff --git a/include/vcl/GraphicNativeMetadata.hxx b/include/vcl/GraphicNativeMetadata.hxx index bc9f871cc06d..7f249bcc4913 100644 --- a/include/vcl/GraphicNativeMetadata.hxx +++ b/include/vcl/GraphicNativeMetadata.hxx @@ -22,13 +22,13 @@ #include <vcl/graph.hxx> -class VCL_DLLPUBLIC GraphicNativeMetadata +class VCL_DLLPUBLIC GraphicNativeMetadata final { sal_uInt16 mRotation; public: GraphicNativeMetadata(); - virtual ~GraphicNativeMetadata(); + ~GraphicNativeMetadata(); bool read(Graphic& rGraphic); sal_uInt16 getRotation() { return mRotation;} diff --git a/include/vcl/GraphicNativeTransform.hxx b/include/vcl/GraphicNativeTransform.hxx index b6b66fc75f98..08053d416536 100644 --- a/include/vcl/GraphicNativeTransform.hxx +++ b/include/vcl/GraphicNativeTransform.hxx @@ -22,7 +22,7 @@ #include <vcl/graph.hxx> -class VCL_DLLPUBLIC GraphicNativeTransform +class VCL_DLLPUBLIC GraphicNativeTransform final { Graphic& mrGraphic; @@ -32,7 +32,7 @@ class VCL_DLLPUBLIC GraphicNativeTransform public: GraphicNativeTransform(Graphic& rGraphic); - virtual ~GraphicNativeTransform(); + ~GraphicNativeTransform(); bool canBeRotated(); bool rotate(sal_uInt16 aRotation); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 041ade5fa8d9..689c0f1ce23e 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -66,7 +66,7 @@ struct EndPopupModeData * All DockingWindows should be converted the new class. */ -class ImplDockingWindowWrapper +class ImplDockingWindowWrapper final { friend class ::vcl::Window; friend class DockingManager; @@ -115,7 +115,7 @@ private: public: ImplDockingWindowWrapper( const vcl::Window *pWindow ); - virtual ~ImplDockingWindowWrapper(); + ~ImplDockingWindowWrapper(); vcl::Window* GetWindow() { return mpDockingWindow; } bool ImplStartDocking( const Point& rPos ); diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index f0ac2ace9ba2..fec0cdd04595 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -54,7 +54,7 @@ enum class MtfConversion typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam ); typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam ); -class VCL_DLLPUBLIC GDIMetaFile +class VCL_DLLPUBLIC GDIMetaFile final { private: ::std::vector< MetaAction* > m_aList; @@ -105,7 +105,7 @@ protected: public: GDIMetaFile(); GDIMetaFile( const GDIMetaFile& rMtf ); - virtual ~GDIMetaFile(); + ~GDIMetaFile(); GDIMetaFile& operator=( const GDIMetaFile& rMtf ); bool operator==( const GDIMetaFile& rMtf ) const; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 2623498c29b0..e5f974323bfb 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -130,7 +130,7 @@ enum class GraphicFileFormat }; -class VCL_DLLPUBLIC GraphicDescriptor +class VCL_DLLPUBLIC GraphicDescriptor final { SvStream* pFileStm; @@ -190,7 +190,7 @@ public: derived from the extension */ GraphicDescriptor( SvStream& rInStream, const OUString* pPath ); - virtual ~GraphicDescriptor(); + ~GraphicDescriptor(); /** starts the detection diff --git a/include/vcl/rendersettings.hxx b/include/vcl/rendersettings.hxx index 47e588ff18ed..d516dfcc41b3 100644 --- a/include/vcl/rendersettings.hxx +++ b/include/vcl/rendersettings.hxx @@ -17,7 +17,7 @@ namespace vcl { -class VCL_DLLPUBLIC RenderSettings +class VCL_DLLPUBLIC RenderSettings final { OutDevState maOutDevState; std::unique_ptr<Wallpaper> mpBackground; @@ -25,9 +25,6 @@ class VCL_DLLPUBLIC RenderSettings public: RenderSettings() {} - - virtual ~RenderSettings() - {} }; } |