diff options
-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 | ||||
-rw-r--r-- | vcl/inc/BitmapSymmetryCheck.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/PhysicalFontCollection.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/fontsubset.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/impgraph.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/opengl/framebuffer.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/opengl/texture.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/textlayout.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/glyphcache.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/Exif.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/JpegTransform.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/JpegWriter.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/wmf/winmtf.hxx | 4 |
19 files changed, 36 insertions, 41 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() - {} }; } diff --git a/vcl/inc/BitmapSymmetryCheck.hxx b/vcl/inc/BitmapSymmetryCheck.hxx index c6a02fa83a7f..e92f68d8f3ee 100644 --- a/vcl/inc/BitmapSymmetryCheck.hxx +++ b/vcl/inc/BitmapSymmetryCheck.hxx @@ -14,11 +14,11 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapaccess.hxx> -class VCL_DLLPUBLIC BitmapSymmetryCheck +class VCL_DLLPUBLIC BitmapSymmetryCheck final { public: BitmapSymmetryCheck(); - virtual ~BitmapSymmetryCheck(); + ~BitmapSymmetryCheck(); static bool check(Bitmap& rBitmap); diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 967cefcb605c..ca499e718885 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -34,11 +34,11 @@ class ImplPreMatchFontSubstitution; // TODO: merge with ImplFontCache // TODO: rename to LogicalFontManager -class VCL_PLUGIN_PUBLIC PhysicalFontCollection +class VCL_PLUGIN_PUBLIC PhysicalFontCollection final { public: explicit PhysicalFontCollection(); - virtual ~PhysicalFontCollection(); + ~PhysicalFontCollection(); // fill the list with device font faces void Add( PhysicalFontFace* ); diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx index fd3b6969bb7a..e2d0fbc17d6a 100644 --- a/vcl/inc/fontsubset.hxx +++ b/vcl/inc/fontsubset.hxx @@ -27,11 +27,11 @@ namespace vcl { struct TrueTypeFont; } ///< SFT's idea of a TTF font -class FontSubsetInfo +class FontSubsetInfo final { public: explicit FontSubsetInfo(); - virtual ~FontSubsetInfo(); + ~FontSubsetInfo(); enum FontType { NO_FONT = 0, diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index b7dcee4dd184..d016f55b4007 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -31,7 +31,7 @@ class GfxLink; struct ImpSwapFile; class GraphicConversionParameters; -class ImpGraphic +class ImpGraphic final { friend class Graphic; @@ -62,7 +62,7 @@ private: ImpGraphic( const Animation& rAnimation ); ImpGraphic( const GDIMetaFile& rMtf ); public: - virtual ~ImpGraphic(); + ~ImpGraphic(); private: ImpGraphic& operator=( const ImpGraphic& rImpGraphic ); diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx index 4bad28a3827b..ec7a45099df7 100644 --- a/vcl/inc/opengl/framebuffer.hxx +++ b/vcl/inc/opengl/framebuffer.hxx @@ -15,7 +15,7 @@ #include <opengl/texture.hxx> -class VCL_DLLPUBLIC OpenGLFramebuffer +class VCL_DLLPUBLIC OpenGLFramebuffer final { private: GLuint mnId; @@ -25,7 +25,7 @@ private: public: OpenGLFramebuffer(); - virtual ~OpenGLFramebuffer(); + ~OpenGLFramebuffer(); int GetWidth() const { return mnWidth; }; int GetHeight() const { return mnHeight; }; diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx index 923e9d43c65e..c8f658efb72f 100644 --- a/vcl/inc/opengl/texture.hxx +++ b/vcl/inc/opengl/texture.hxx @@ -73,7 +73,7 @@ public: GLuint AddStencil(); }; -class VCL_DLLPUBLIC OpenGLTexture +class VCL_DLLPUBLIC OpenGLTexture final { private: // if the rect size doesn't match the mpImpl one, this instance @@ -98,7 +98,7 @@ public: OpenGLTexture( int nX, int nY, int nWidth, int nHeight ); OpenGLTexture( const OpenGLTexture& rTexture ); OpenGLTexture( const OpenGLTexture& rTexture, int nX, int nY, int nWidth, int nHeight ); - virtual ~OpenGLTexture(); + ~OpenGLTexture(); bool IsUnique() const; diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx index 7371abd9eb62..97350c0aa405 100644 --- a/vcl/inc/textlayout.hxx +++ b/vcl/inc/textlayout.hxx @@ -84,11 +84,11 @@ namespace vcl /** a class which allows rendering text of a Control onto a device, by taking into account the metrics of a reference device. */ - class ControlTextRenderer + class ControlTextRenderer final { public: ControlTextRenderer( const Control& _rControl, OutputDevice& _rTargetDevice, OutputDevice& _rReferenceDevice ); - virtual ~ControlTextRenderer(); + ~ControlTextRenderer(); Rectangle DrawText( const Rectangle& _rRect, const OUString& _rText, DrawTextFlags _nStyle, diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 594af707623f..e5852a0a6915 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -144,11 +144,11 @@ private: mutable long mnLruValue; }; -class VCL_DLLPUBLIC FreetypeFont +class VCL_DLLPUBLIC FreetypeFont final { public: FreetypeFont( const FontSelectPattern&, FreetypeFontInfo* ); - virtual ~FreetypeFont(); + ~FreetypeFont(); const OString& GetFontFileName() const; bool TestFont() const { return mbFaceOk;} diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx index 4f872d4652c1..4cc823dcca27 100644 --- a/vcl/source/filter/jpeg/Exif.hxx +++ b/vcl/source/filter/jpeg/Exif.hxx @@ -41,7 +41,7 @@ enum Tag { ORIENTATION = 0x0112 }; -class Exif +class Exif final { private: Orientation maOrientation; @@ -68,7 +68,7 @@ private: public: Exif(); - virtual ~Exif(); + ~Exif(); bool hasExif() { return mbExifPresent;} diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx index 78924438ba07..efac42ff2218 100644 --- a/vcl/source/filter/jpeg/JpegTransform.hxx +++ b/vcl/source/filter/jpeg/JpegTransform.hxx @@ -22,7 +22,7 @@ #include <vcl/graph.hxx> -class JpegTransform +class JpegTransform final { sal_uInt16 maRotate; SvStream& mrInputStream; @@ -31,7 +31,7 @@ class JpegTransform public: JpegTransform(SvStream& rInputStream, SvStream& rOutputStream); - virtual ~JpegTransform(); + ~JpegTransform(); void setRotate(sal_uInt16 aRotate); void perform(); diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx index 672792194982..e5600e4e49cc 100644 --- a/vcl/source/filter/jpeg/JpegWriter.hxx +++ b/vcl/source/filter/jpeg/JpegWriter.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -class JPEGWriter +class JPEGWriter final { SvStream& mrStream; BitmapReadAccess* mpReadAccess; @@ -45,8 +45,6 @@ public: const css::uno::Sequence< css::beans::PropertyValue >* pFilterData, bool* pExportWasGrey ); - virtual ~JPEGWriter() {}; - void* GetScanline( long nY ); bool Write( const Graphic& rGraphic ); diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 63118d44950d..5fca59bb42fe 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -434,7 +434,7 @@ struct BSaveStruct }; -class WinMtfOutput +class WinMtfOutput final { WinMtfPathObj aPathObj; WinMtfClipPath aClipPath; @@ -621,7 +621,7 @@ public: void PassEMFPlusHeaderInfo(); explicit WinMtfOutput( GDIMetaFile& rGDIMetaFile ); - virtual ~WinMtfOutput(); + ~WinMtfOutput(); }; class WinMtf |