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 /svx/source/sdr | |
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 'svx/source/sdr')
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index fdafdc00039d..35e8c4c8b886 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -422,6 +422,9 @@ namespace sdr { namespace contact { /** determines whether a given layer is visible */ virtual bool isLayerVisible( SdrLayerID _nLayerID ) const = 0; + + protected: + ~IPageViewAccess() {} }; //==================================================================== @@ -435,6 +438,8 @@ namespace sdr { namespace contact { public: SdrPageViewAccess( const SdrPageView& _rPageView ) : m_rPageView( _rPageView ) { } + virtual ~SdrPageViewAccess() {} + virtual bool isDesignMode() const; virtual Reference< XControlContainer > getControlContainer( const OutputDevice& _rDevice ) const; @@ -478,6 +483,8 @@ namespace sdr { namespace contact { { } + virtual ~InvisibleControlViewAccess() {} + virtual bool isDesignMode() const; virtual Reference< XControlContainer > getControlContainer( const OutputDevice& _rDevice ) const; @@ -526,6 +533,8 @@ namespace sdr { namespace contact { { } + virtual ~DummyPageViewAccess() {} + virtual bool isDesignMode() const; virtual Reference< XControlContainer > getControlContainer( const OutputDevice& _rDevice ) const; |