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 /sdext | |
| 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 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/tree/treevisiting.hxx | 3 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterTimer.hxx | 6 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterViewFactory.hxx | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx index 2da532e03e4a..6af5402af994 100644 --- a/sdext/source/pdfimport/tree/treevisiting.hxx +++ b/sdext/source/pdfimport/tree/treevisiting.hxx @@ -75,6 +75,9 @@ namespace pdfi struct ElementTreeVisitable { virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt ) = 0; + + protected: + ~ElementTreeVisitable() {} }; typedef boost::shared_ptr<ElementTreeVisitable> ElementTreeVisitableSharedPtr; } diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index f674a03f8e9c..eca3dc307dc1 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -88,8 +88,12 @@ class PresenterClockTimer public PresenterClockTimerInterfaceBase { public: - class Listener { public: + class Listener { + public: virtual void TimeHasChanged (const oslDateTime& rCurrentTime) = 0; + + protected: + ~Listener() {} }; typedef ::boost::shared_ptr<Listener> SharedListener; diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 7d06be5515d1..a37435554fbf 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -76,6 +76,8 @@ protected: bool mbIsPresenterViewActive; CachablePresenterView (void); + + ~CachablePresenterView() {} }; /** Factory of the presenter screen specific views. The supported set of |