diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-14 13:27:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-14 13:32:02 +0100 |
| commit | 6e67c03dc0225fc66343546b14e902b9d238b1a3 (patch) | |
| tree | 6e078783d65e280a721b4e46f0ae0ca6b950f121 /canvas/inc | |
| parent | fe4be5047988782f3143a1af505c5eecb3f2af5a (diff) | |
Enable -Wnon-virtual-dtor for GCC 4.6
...which has the necessary features to support it.
Change a lot of classes to either contain a protected non-virtual dtor
(which is backwards compatible, so even works for cppumaker-generated
UNO headers) or a public virtual one.
cppuhelper/propertysetmixin.hxx still needs to disable the warning, as
the relevant class has a non-virtual dtor but friends, which would still
cause GCC to warn.
Includes a patch for libcmis, intended to be upstreamed.
Diffstat (limited to 'canvas/inc')
| -rw-r--r-- | canvas/inc/canvas/base/sprite.hxx | 3 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/spritesurface.hxx | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/canvas/inc/canvas/base/sprite.hxx b/canvas/inc/canvas/base/sprite.hxx index 38a2270b8e5c..161551b64ed2 100644 --- a/canvas/inc/canvas/base/sprite.hxx +++ b/canvas/inc/canvas/base/sprite.hxx @@ -99,6 +99,9 @@ namespace canvas /** Query sprite priority */ virtual double getPriority() const = 0; + + protected: + ~Sprite() {} }; /** Functor providing a StrictWeakOrdering for sprite references diff --git a/canvas/inc/canvas/base/spritesurface.hxx b/canvas/inc/canvas/base/spritesurface.hxx index c60099f1563b..6ff1c3c8c954 100644 --- a/canvas/inc/canvas/base/spritesurface.hxx +++ b/canvas/inc/canvas/base/spritesurface.hxx @@ -68,6 +68,9 @@ namespace canvas virtual void updateSprite( const Sprite::Reference& rSprite, const ::basegfx::B2DPoint& rPos, const ::basegfx::B2DRange& rUpdateArea ) = 0; + + protected: + ~SpriteSurface() {} }; } |