summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /include/oox
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/drawingml/effectpropertiescontext.hxx2
-rw-r--r--include/oox/drawingml/graphicshapecontext.hxx2
-rw-r--r--include/oox/drawingml/linepropertiescontext.hxx2
-rw-r--r--include/oox/drawingml/shapestylecontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablebackgroundstylecontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablecellcontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablecontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablepartstylecontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablerowcontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablestylecellstylecontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablestylecontext.hxx2
-rw-r--r--include/oox/drawingml/table/tablestyletextstylecontext.hxx2
-rw-r--r--include/oox/drawingml/textliststylecontext.hxx2
-rw-r--r--include/oox/drawingml/textparagraphpropertiescontext.hxx2
-rw-r--r--include/oox/ole/olehelper.hxx2
-rw-r--r--include/oox/ppt/customshowlistcontext.hxx2
-rw-r--r--include/oox/ppt/slidemastertextstylescontext.hxx2
17 files changed, 17 insertions, 17 deletions
diff --git a/include/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx
index 570b273ad507..060604b61d50 100644
--- a/include/oox/drawingml/effectpropertiescontext.hxx
+++ b/include/oox/drawingml/effectpropertiescontext.hxx
@@ -24,7 +24,7 @@ class OOX_DLLPUBLIC EffectPropertiesContext : public ::oox::core::ContextHandler
public:
EffectPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
EffectProperties& rEffectProperties ) throw();
- ~EffectPropertiesContext();
+ virtual ~EffectPropertiesContext();
virtual ::oox::core::ContextHandlerRef
onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index a9afc0b20ebd..72881fe4a1c9 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -55,7 +55,7 @@ class OleObjectGraphicDataContext : public ShapeContext
{
public:
OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pShapePtr );
- ~OleObjectGraphicDataContext();
+ virtual ~OleObjectGraphicDataContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
private:
diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx
index f302f11431b0..efd85ca4e247 100644
--- a/include/oox/drawingml/linepropertiescontext.hxx
+++ b/include/oox/drawingml/linepropertiescontext.hxx
@@ -35,7 +35,7 @@ public:
LinePropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
const ::oox::AttributeList& rAttributes,
LineProperties& rLineProperties ) throw();
- ~LinePropertiesContext();
+ virtual ~LinePropertiesContext();
virtual ::oox::core::ContextHandlerRef
onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx
index 7be239389d7a..b7a479124560 100644
--- a/include/oox/drawingml/shapestylecontext.hxx
+++ b/include/oox/drawingml/shapestylecontext.hxx
@@ -29,7 +29,7 @@ class ShapeStyleContext : public ::oox::core::ContextHandler2
{
public:
ShapeStyleContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape );
- ~ShapeStyleContext();
+ virtual ~ShapeStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
index 6be484408295..4885f5bc1466 100644
--- a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
@@ -30,7 +30,7 @@ class TableBackgroundStyleContext : public ::oox::core::ContextHandler2
{
public:
TableBackgroundStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStyle& rTableStyle );
- ~TableBackgroundStyleContext();
+ virtual ~TableBackgroundStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablecellcontext.hxx b/include/oox/drawingml/table/tablecellcontext.hxx
index 2d06136f1604..4656e243e9df 100644
--- a/include/oox/drawingml/table/tablecellcontext.hxx
+++ b/include/oox/drawingml/table/tablecellcontext.hxx
@@ -31,7 +31,7 @@ class TableCellContext : public ::oox::core::ContextHandler2
public:
TableCellContext( ::oox::core::ContextHandler2Helper& rParent,
const ::oox::AttributeList& rAttribs, TableCell& rTableCell );
- ~TableCellContext();
+ virtual ~TableCellContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablecontext.hxx b/include/oox/drawingml/table/tablecontext.hxx
index 25471b78cdac..b9940422435d 100644
--- a/include/oox/drawingml/table/tablecontext.hxx
+++ b/include/oox/drawingml/table/tablecontext.hxx
@@ -31,7 +31,7 @@ class TableContext : public ShapeContext
{
public:
TableContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pShapePtr );
- ~TableContext();
+ virtual ~TableContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablepartstylecontext.hxx b/include/oox/drawingml/table/tablepartstylecontext.hxx
index f11e542d3a15..84b7ef1e2f02 100644
--- a/include/oox/drawingml/table/tablepartstylecontext.hxx
+++ b/include/oox/drawingml/table/tablepartstylecontext.hxx
@@ -30,7 +30,7 @@ class TablePartStyleContext : public ::oox::core::ContextHandler2
{
public:
TablePartStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
- ~TablePartStyleContext();
+ virtual ~TablePartStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablerowcontext.hxx b/include/oox/drawingml/table/tablerowcontext.hxx
index abe483de98dc..0224a4a513ed 100644
--- a/include/oox/drawingml/table/tablerowcontext.hxx
+++ b/include/oox/drawingml/table/tablerowcontext.hxx
@@ -32,7 +32,7 @@ class TableRowContext : public ::oox::core::ContextHandler2
public:
TableRowContext( ::oox::core::ContextHandler2Helper& rParent,
const ::oox::AttributeList& rAttribs, TableRow& rTableRow );
- ~TableRowContext();
+ virtual ~TableRowContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablestylecellstylecontext.hxx b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
index 523d51f4300f..b7d30267ee5b 100644
--- a/include/oox/drawingml/table/tablestylecellstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
@@ -30,7 +30,7 @@ class TableStyleCellStyleContext : public ::oox::core::ContextHandler2
{
public:
TableStyleCellStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
- ~TableStyleCellStyleContext();
+ virtual ~TableStyleCellStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablestylecontext.hxx b/include/oox/drawingml/table/tablestylecontext.hxx
index 922d3fe4b2c4..fd6eb526384e 100644
--- a/include/oox/drawingml/table/tablestylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecontext.hxx
@@ -32,7 +32,7 @@ public:
TableStyleContext( ::oox::core::ContextHandler2Helper& rParent,
const ::oox::AttributeList& rAttribs,
TableStyle& rTableStyle );
- ~TableStyleContext();
+ virtual ~TableStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/table/tablestyletextstylecontext.hxx b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
index 71ab67445a3a..6543e319ecf6 100644
--- a/include/oox/drawingml/table/tablestyletextstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
@@ -32,7 +32,7 @@ public:
TableStyleTextStyleContext( ::oox::core::ContextHandler2Helper& rParent,
const ::oox::AttributeList& rAttribs,
TableStylePart& rTableStylePart );
- ~TableStyleTextStyleContext();
+ virtual ~TableStyleTextStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx
index 5dba0ab9a91e..2e9900830500 100644
--- a/include/oox/drawingml/textliststylecontext.hxx
+++ b/include/oox/drawingml/textliststylecontext.hxx
@@ -29,7 +29,7 @@ class TextListStyleContext : public ::oox::core::ContextHandler2
{
public:
TextListStyleContext( ::oox::core::ContextHandler2Helper& rParent, TextListStyle& rTextListStyle );
- ~TextListStyleContext();
+ virtual ~TextListStyleContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx
index 0d3dc98d629e..b2b124daf7a3 100644
--- a/include/oox/drawingml/textparagraphpropertiescontext.hxx
+++ b/include/oox/drawingml/textparagraphpropertiescontext.hxx
@@ -36,7 +36,7 @@ public:
TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
const ::oox::AttributeList& rAttributes,
TextParagraphProperties& rTextParagraphProperties );
- ~TextParagraphPropertiesContext();
+ virtual ~TextParagraphPropertiesContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 82afa4173112..5b25c1df7e6e 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -173,7 +173,7 @@ protected:
sal_Int32 nSize );
public:
MSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel );
- ~MSConvertOCXControls();
+ virtual ~MSConvertOCXControls();
sal_Bool ReadOCXStorage( SotStorageRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp );
sal_Bool ReadOCXCtlsStream(SotStorageStreamRef& rSrc1, ::com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rxFormComp,
sal_Int32 nPos, sal_Int32 nSize );
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index 20e2971f8f44..23739cf97ad8 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -42,7 +42,7 @@ namespace oox { namespace ppt {
CustomShowListContext( ::oox::core::FragmentHandler2& rParent,
std::vector< CustomShow >& rCustomShowList );
- ~CustomShowListContext( );
+ virtual ~CustomShowListContext( );
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
};
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index bc7ca2d8ed73..05aa3853d5f5 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -31,7 +31,7 @@ class SlideMasterTextStylesContext : public oox::core::FragmentHandler2
{
public:
SlideMasterTextStylesContext( ::oox::core::FragmentHandler2& rParent, SlidePersistPtr pSlidePersistPtr );
- ~SlideMasterTextStylesContext();
+ virtual ~SlideMasterTextStylesContext();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE;
protected: