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.

5 files changed, 15 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() {}
     };
 }
 
diff --git a/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx
index b5ecb85b6b97..ca96f3786ac4 100644
--- a/canvas/source/cairo/cairo_sprite.hxx
+++ b/canvas/source/cairo/cairo_sprite.hxx
@@ -66,6 +66,9 @@ namespace cairocanvas
         virtual void redraw( const ::cairo::CairoSharedPtr& pCairo,
                              const ::basegfx::B2DPoint&     rOrigOutputPos,
                              bool                           bBufferedUpdate ) const = 0;
+
+    protected:
+        ~Sprite() {}
     };
 }
 
diff --git a/canvas/source/null/sprite.hxx b/canvas/source/null/sprite.hxx
index 56a38be96914..dc25d23ce6e4 100644
--- a/canvas/source/null/sprite.hxx
+++ b/canvas/source/null/sprite.hxx
@@ -42,6 +42,9 @@ namespace nullcanvas
         /** Redraw sprite
          */
         virtual void redraw() const = 0;
+
+    protected:
+        ~Sprite() {}
     };
 }
 
diff --git a/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx
index b2713eb4486d..b86137d4f383 100644
--- a/canvas/source/vcl/sprite.hxx
+++ b/canvas/source/vcl/sprite.hxx
@@ -66,6 +66,9 @@ namespace vclcanvas
         virtual void redraw( OutputDevice&              rOutDev,
                              const ::basegfx::B2DPoint& rPos,
                              bool                       bBufferedUpdate ) const = 0;
+
+    protected:
+        ~Sprite() {}
     };
 }