diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /include/xmloff | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (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/xmloff')
-rw-r--r-- | include/xmloff/SchXMLImportHelper.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLEventsImportContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLFontAutoStylePool.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLPageExport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextMasterPageExport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLTextShapeImportHelper.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/attrlist.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/formlayerexport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/formlayerimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/shapeimport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtimp.hxx | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index fe20e8ebcaed..e35f5b694a8a 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -84,7 +84,7 @@ private: public: SchXMLImportHelper(); - ~SchXMLImportHelper(); + virtual ~SchXMLImportHelper(); /** get the context for reading the <chart:chart> element with subelements. The result is stored in the XModel given if it also implements diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index 278c5cc6c658..9dad504424a6 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -85,7 +85,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace> & xNameRepl); - ~XMLEventsImportContext(); + virtual ~XMLEventsImportContext(); void AddEventValues( const OUString& rEventName, diff --git a/include/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx index 961832f7e869..5deabf76e9cd 100644 --- a/include/xmloff/XMLFontAutoStylePool.hxx +++ b/include/xmloff/XMLFontAutoStylePool.hxx @@ -48,7 +48,7 @@ protected: public: XMLFontAutoStylePool( SvXMLExport& rExport, bool tryToEmbedFonts = false ); - ~XMLFontAutoStylePool(); + virtual ~XMLFontAutoStylePool(); OUString Add( const OUString& rFamilyName, diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index 0a5053960040..5961ad3b30a8 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -90,7 +90,7 @@ protected: public: XMLPageExport( SvXMLExport& rExp ); - ~XMLPageExport(); + virtual ~XMLPageExport(); void collectAutoStyles( bool bUsed ) { exportStyles( bUsed, true ); } void exportAutoStyles(); diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx index dd626bbdea6d..b696241b450b 100644 --- a/include/xmloff/XMLTextMasterPageExport.hxx +++ b/include/xmloff/XMLTextMasterPageExport.hxx @@ -60,7 +60,7 @@ protected: public: XMLTextMasterPageExport( SvXMLExport& rExp ); - ~XMLTextMasterPageExport(); + virtual ~XMLTextMasterPageExport(); }; #endif // INCLUDED_XMLOFF_XMLTEXTMASTERPAGEEXPORT_HXX diff --git a/include/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx index 18f00ec68ecd..bfb317aacec1 100644 --- a/include/xmloff/XMLTextShapeImportHelper.hxx +++ b/include/xmloff/XMLTextShapeImportHelper.hxx @@ -35,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLTextShapeImportHelper : public XMLShapeImportHelper public: XMLTextShapeImportHelper( SvXMLImport& rImp ); - ~XMLTextShapeImportHelper(); + virtual ~XMLTextShapeImportHelper(); virtual void addShape( ::com::sun::star::uno::Reference< diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx index 7f3f78c2c223..240d53dd47d7 100644 --- a/include/xmloff/attrlist.hxx +++ b/include/xmloff/attrlist.hxx @@ -47,7 +47,7 @@ public: SvXMLAttributeList( const SvXMLAttributeList& ); SvXMLAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> & rAttrList ); - ~SvXMLAttributeList(); + virtual ~SvXMLAttributeList(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); static SvXMLAttributeList* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 91336749f2ec..346e7455e13a 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -58,7 +58,7 @@ namespace xmloff OFormLayerXMLExport_Impl* m_pImpl; protected: - ~OFormLayerXMLExport(); + virtual ~OFormLayerXMLExport(); public: OFormLayerXMLExport(SvXMLExport& _rContext); diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 54d9c00a330d..8ad5fa4fc818 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -52,7 +52,7 @@ namespace xmloff public: OFormLayerXMLImport(SvXMLImport& _rImporter); - ~OFormLayerXMLImport(); + virtual ~OFormLayerXMLImport(); /** start importing the forms of the given page diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index d0ffcab3aad1..47156c886482 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -314,7 +314,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, SvXMLImportPropertyMapper *pExtMapper=0 ); - ~XMLShapeImportHelper(); + virtual ~XMLShapeImportHelper(); SvXMLShapeContext* CreateGroupChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index ff4ca249683a..4ab7881b00da 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -399,7 +399,7 @@ public: bool const bProgress = false, bool const bBlockMode = false, bool const bOrganizerMode = false); - ~XMLTextImportHelper(); + virtual ~XMLTextImportHelper(); void SetCursor( const ::com::sun::star::uno::Reference < |