diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /xmlscript/source | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'xmlscript/source')
-rw-r--r-- | xmlscript/source/xml_helper/xml_impctx.cxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmldlg_imexp/imp_share.hxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 6 | ||||
-rw-r--r-- | xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 10 | ||||
-rw-r--r-- | xmlscript/source/xmllib_imexp/imp_share.hxx | 4 | ||||
-rw-r--r-- | xmlscript/source/xmlmod_imexp/imp_share.hxx | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 95f60fa06bd3..c79e8d50a3e7 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -133,7 +133,7 @@ public: DocumentHandlerImpl( Reference< xml::input::XRoot > const & xRoot, bool bSingleThreadedUse ); - virtual ~DocumentHandlerImpl() throw (); + virtual ~DocumentHandlerImpl() throw () override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -340,7 +340,7 @@ public: OUString * pLocalNames, OUString * pQNames, Reference< xml::sax::XAttributeList > const & xAttributeList, DocumentHandlerImpl * pHandler ); - virtual ~ExtendedAttributes() throw (); + virtual ~ExtendedAttributes() throw () override; // XAttributes virtual sal_Int32 SAL_CALL getLength() diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 9802f87b195c..f185fcd0276e 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -174,7 +174,7 @@ public: , XMLNS_DIALOGS_UID( rOther.XMLNS_DIALOGS_UID ) , XMLNS_SCRIPT_UID( rOther.XMLNS_SCRIPT_UID ) {} - virtual ~DialogImport(); + virtual ~DialogImport() override; const css::uno::Reference< css::frame::XModel >& getDocOwner() { return _xDoc; } @@ -214,7 +214,7 @@ public: sal_Int32 nUid, OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ElementBase * pParent, DialogImport * pImport ); - virtual ~ElementBase(); + virtual ~ElementBase() override; // XElement virtual css::uno::Reference<css::xml::input::XElement> SAL_CALL getParent() diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx index 199528bdbbe7..9476d44f39bd 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx @@ -49,7 +49,7 @@ namespace xmlscript public: explicit XMLBasicExporterBase(bool bOasis); - virtual ~XMLBasicExporterBase(); + virtual ~XMLBasicExporterBase() override; // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -76,7 +76,7 @@ namespace xmlscript { public: explicit XMLBasicExporter(); - virtual ~XMLBasicExporter(); + virtual ~XMLBasicExporter() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) @@ -91,7 +91,7 @@ namespace xmlscript { public: explicit XMLOasisBasicExporter(); - virtual ~XMLOasisBasicExporter(); + virtual ~XMLOasisBasicExporter() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index d4f12c784266..5a913c665533 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -57,7 +57,7 @@ namespace xmlscript BasicElementBase( const OUString& rLocalName, const css::uno::Reference< css::xml::input::XAttributes >& xAttributes, BasicElementBase* pParent, BasicImport* pImport ); - virtual ~BasicElementBase(); + virtual ~BasicElementBase() override; // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() @@ -199,7 +199,7 @@ namespace xmlscript public: BasicImport( const css::uno::Reference< css::frame::XModel >& rxModel, bool bOasis ); - virtual ~BasicImport(); + virtual ~BasicImport() override; // XRoot virtual void SAL_CALL startDocument( @@ -237,7 +237,7 @@ namespace xmlscript public: XMLBasicImporterBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext, bool bOasis ); - virtual ~XMLBasicImporterBase(); + virtual ~XMLBasicImporterBase() override; // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) @@ -274,7 +274,7 @@ namespace xmlscript public: explicit XMLBasicImporter( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~XMLBasicImporter(); + virtual ~XMLBasicImporter() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) @@ -290,7 +290,7 @@ namespace xmlscript public: explicit XMLOasisBasicImporter( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~XMLOasisBasicImporter(); + virtual ~XMLOasisBasicImporter() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) diff --git a/xmlscript/source/xmllib_imexp/imp_share.hxx b/xmlscript/source/xmllib_imexp/imp_share.hxx index ec02ffe9278a..74560ece78a6 100644 --- a/xmlscript/source/xmllib_imexp/imp_share.hxx +++ b/xmlscript/source/xmllib_imexp/imp_share.hxx @@ -132,7 +132,7 @@ public: { } - virtual ~LibraryImport(); + virtual ~LibraryImport() override; // XRoot virtual void SAL_CALL startDocument( @@ -167,7 +167,7 @@ public: OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, LibElementBase * pParent, LibraryImport * pImport ); - virtual ~LibElementBase(); + virtual ~LibElementBase() override; // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() diff --git a/xmlscript/source/xmlmod_imexp/imp_share.hxx b/xmlscript/source/xmlmod_imexp/imp_share.hxx index 969a56d6d609..b7ae02ceac02 100644 --- a/xmlscript/source/xmlmod_imexp/imp_share.hxx +++ b/xmlscript/source/xmlmod_imexp/imp_share.hxx @@ -62,7 +62,7 @@ public: { } - virtual ~ModuleImport(); + virtual ~ModuleImport() override; // XRoot virtual void SAL_CALL startDocument( @@ -97,7 +97,7 @@ public: OUString const & rLocalName, css::uno::Reference< css::xml::input::XAttributes > const & xAttributes, ModuleImport * pImport ); - virtual ~ModuleElement(); + virtual ~ModuleElement() override; // XElement virtual css::uno::Reference< css::xml::input::XElement > SAL_CALL getParent() |