summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 21:22:51 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 21:30:38 +0200
commit6a3b0b7cc45b7aab2611331476decfd06211a73d (patch)
treef3eaddfaa3b79739221293f0ffeff5cb4eb51655
parentf7e2f60d51e811aa2dbd0d8acf2c4c0dcefe14de (diff)
Explicitly mark overriding destructors as "virtual," Mac OS X redux
Change-Id: Ib7ab02bc3cdadbdfe0e0787560d1dd562eb85be9
-rw-r--r--shell/source/backends/macbe/macbackend.hxx2
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx12
-rw-r--r--vcl/inc/quartz/salgdi.h2
-rw-r--r--vcl/osx/DragSourceContext.hxx2
-rw-r--r--vcl/osx/clipboard.hxx2
5 files changed, 10 insertions, 10 deletions
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx
index 33687e841d8e..75d3288ca799 100644
--- a/shell/source/backends/macbe/macbackend.hxx
+++ b/shell/source/backends/macbe/macbackend.hxx
@@ -123,7 +123,7 @@ protected:
MacOSXBackend();
/** Destructor */
- ~MacOSXBackend(void);
+ virtual ~MacOSXBackend(void);
};
#endif // INCLUDED_SHELL_SOURCE_BACKENDS_MACBE_MACBACKEND_HXX
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
index ef0d6ea554ad..d74755071deb 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
@@ -349,7 +349,7 @@ public:
*/
SRotate(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
- ~SRotate(){}
+ virtual ~SRotate(){}
private:
/** axis to rotate CCW about
*/
@@ -391,7 +391,7 @@ public:
*/
SScale(const basegfx::B3DVector& Scale, const basegfx::B3DVector& Origin,bool bInter, double T0, double T1);
- ~SScale(){}
+ virtual ~SScale(){}
private:
basegfx::B3DVector scale;
basegfx::B3DVector origin;
@@ -421,7 +421,7 @@ public:
*/
STranslate(const basegfx::B3DVector& Vector,bool bInter, double T0, double T1);
- ~STranslate(){}
+ virtual ~STranslate(){}
private:
/** vector to translate by
*/
@@ -452,7 +452,7 @@ public:
*/
SEllipseTranslate(double dWidth, double dHeight, double dStartPosition, double dEndPosition, bool bInter, double T0, double T1);
- ~SEllipseTranslate(){}
+ virtual ~SEllipseTranslate(){}
private:
/** width and length of the ellipse
*/
@@ -473,7 +473,7 @@ public:
RotateAndScaleDepthByWidth* clone() SAL_OVERRIDE;
RotateAndScaleDepthByWidth(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
- ~RotateAndScaleDepthByWidth(){}
+ virtual ~RotateAndScaleDepthByWidth(){}
private:
basegfx::B3DVector axis;
basegfx::B3DVector origin;
@@ -489,7 +489,7 @@ public:
RotateAndScaleDepthByHeight* clone() SAL_OVERRIDE;
RotateAndScaleDepthByHeight(const basegfx::B3DVector& Axis,const basegfx::B3DVector& Origin,double Angle,bool bInter, double T0, double T1);
- ~RotateAndScaleDepthByHeight(){}
+ virtual ~RotateAndScaleDepthByHeight(){}
private:
basegfx::B3DVector axis;
basegfx::B3DVector origin;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 722d368a5ffc..28999b470c72 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -65,7 +65,7 @@ class CoreTextFontData : public PhysicalFontFace
public:
CoreTextFontData( const ImplDevFontAttributes&, sal_IntPtr nFontID );
- ~CoreTextFontData();
+ virtual ~CoreTextFontData();
PhysicalFontFace* Clone() const SAL_OVERRIDE;
ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index 826c58304855..41ed086f0c9d 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -39,7 +39,7 @@ class DragSourceContext: public cppu::BaseMutex,
{
public:
DragSourceContext();
- ~DragSourceContext();
+ virtual ~DragSourceContext();
virtual sal_Int32 SAL_CALL getCurrentCursor( )
throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index d03e7660d444..bcacc6348edb 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -84,7 +84,7 @@ public:
AquaClipboard(NSPasteboard* pasteboard = NULL,
bool bUseSystemClipboard = true);
- ~AquaClipboard();
+ virtual ~AquaClipboard();
// XClipboard