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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/inc/oox/drawingml/customshapeproperties.hxx | 1 | ||||
| -rw-r--r-- | oox/inc/oox/mathml/export.hxx | 6 | ||||
| -rw-r--r-- | oox/inc/oox/mathml/import.hxx | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx index 5fd6cd0121c6..957a32a34eda 100644 --- a/oox/inc/oox/drawingml/customshapeproperties.hxx +++ b/oox/inc/oox/drawingml/customshapeproperties.hxx @@ -126,6 +126,7 @@ protected: static com::sun::star::drawing::EnhancedCustomShapeParameterPair createParameterPair( const ParameterPairData *pData ); static com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair > createParameterPairSequence( size_t nElems, const ParameterPairData *pData ); public: + virtual ~CustomShapeProvider() {} virtual PropertyMap getProperties() = 0; }; diff --git a/oox/inc/oox/mathml/export.hxx b/oox/inc/oox/mathml/export.hxx index f4e05633e1e6..6c35feba4b92 100644 --- a/oox/inc/oox/mathml/export.hxx +++ b/oox/inc/oox/mathml/export.hxx @@ -42,8 +42,12 @@ namespace oox class OOX_DLLPUBLIC FormulaExportBase { public: - FormulaExportBase(); virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) = 0; + +protected: + FormulaExportBase(); + + ~FormulaExportBase() {} }; } // namespace diff --git a/oox/inc/oox/mathml/import.hxx b/oox/inc/oox/mathml/import.hxx index 8c922abf73ac..971dfec9113d 100644 --- a/oox/inc/oox/mathml/import.hxx +++ b/oox/inc/oox/mathml/import.hxx @@ -49,9 +49,13 @@ class XmlStream; class OOX_DLLPUBLIC FormulaImportBase { public: - FormulaImportBase(); virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) = 0; virtual Size getFormulaSize() const = 0; + +protected: + FormulaImportBase(); + + ~FormulaImportBase() {} }; } // namespace |