diff options
-rwxr-xr-x | compilerplugins/clang/finalclasses.py | 3 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/saxeventkeeperimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureverifierimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/gpg/SEInitializer.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/macrosecurity.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsignaturehelper2.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xsecctl.hxx | 2 |
11 files changed, 12 insertions, 11 deletions
diff --git a/compilerplugins/clang/finalclasses.py b/compilerplugins/clang/finalclasses.py index 49a30b1e6511..7b08bdfbd966 100755 --- a/compilerplugins/clang/finalclasses.py +++ b/compilerplugins/clang/finalclasses.py @@ -32,6 +32,7 @@ with open("workdir/loplugin.finalclasses.log") as txt: else: print( "unknown line: " + line) +match_module_inc = re.compile('^\w+/inc/') tmpset = set() for clazz in sorted(definitionSet - inheritFromSet): file = definitionToFileDict[clazz] @@ -42,7 +43,7 @@ for clazz in sorted(definitionSet - inheritFromSet): if (file.startswith("workdir/")): continue # We are only really interested in classes that are shared between linkage units, where the compiler # is not able to figure out for itself that classes are final. - if not(file.startswith("include/") or file.startswith("sw/inc/") or file.startswith("sc/inc/") or file.startswith("vcl/inc/")): continue + if not(file.startswith("include/") or match_module_inc.match(file)): continue # Exclude URE if file.startswith("include/com/"): continue if file.startswith("include/cppu/"): continue diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index d91612380e45..e3edb857934f 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -40,7 +40,7 @@ namespace com::sun::star::xml::crypto::sax { class XSAXEventKeeperStatusChangeLi namespace com::sun::star::xml::csax { class XCompressedDocumentHandler; } namespace com::sun::star::xml::wrapper { class XXMLDocumentWrapper; } -class SAXEventKeeperImpl : public cppu::WeakImplHelper +class SAXEventKeeperImpl final : public cppu::WeakImplHelper < css::xml::crypto::sax::XSecuritySAXEventKeeper, css::xml::crypto::sax::XReferenceResolvedBroadcaster, diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index 6554bb572c4c..212feb25cb48 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -40,7 +40,7 @@ typedef cppu::ImplInheritanceHelper css::lang::XServiceInfo > SignatureCreatorImpl_Base; -class SignatureCreatorImpl : public SignatureCreatorImpl_Base +class SignatureCreatorImpl final : public SignatureCreatorImpl_Base /****** SignatureCreatorImpl.hxx/CLASS SignatureCreatorImpl ******************* * * NAME diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index 6103cabbbe8e..37327fd5f9fb 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -39,7 +39,7 @@ typedef cppu::ImplInheritanceHelper css::lang::XServiceInfo > SignatureVerifierImpl_Base; -class SignatureVerifierImpl : public SignatureVerifierImpl_Base +class SignatureVerifierImpl final : public SignatureVerifierImpl_Base /****** SignatureVerifier.hxx/CLASS SignatureVerifierImpl ********************* * * NAME diff --git a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx index 4be61d5fe562..4f10e5db23fe 100644 --- a/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx @@ -34,7 +34,7 @@ namespace com::sun::star::lang { class XMultiServiceFactory; } namespace com::sun::star::xml::wrapper { class XXMLElementWrapper; } -class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper< +class XMLSignatureTemplateImpl final : public ::cppu::WeakImplHelper< css::xml::crypto::XXMLSignatureTemplate , css::lang::XServiceInfo > { diff --git a/xmlsecurity/inc/gpg/SEInitializer.hxx b/xmlsecurity/inc/gpg/SEInitializer.hxx index 0aef1dd8b7de..67ab7a53188e 100644 --- a/xmlsecurity/inc/gpg/SEInitializer.hxx +++ b/xmlsecurity/inc/gpg/SEInitializer.hxx @@ -20,7 +20,7 @@ namespace com::sun::star::xml::crypto { class XXMLSecurityContext; } -class XSECXMLSEC_DLLPUBLIC SEInitializerGpg : public cppu::WeakImplHelper +class XSECXMLSEC_DLLPUBLIC SEInitializerGpg final : public cppu::WeakImplHelper < css::xml::crypto::XSEInitializer, css::lang::XServiceInfo diff --git a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx index 15d58528d805..39c8496f2218 100644 --- a/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx +++ b/xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx @@ -36,7 +36,7 @@ namespace com::sun::star::xml::crypto { class XXMLSecurityContext; } namespace com::sun::star::lang { class XMultiServiceFactory; } -class XSECXMLSEC_DLLPUBLIC XMLSignature_GpgImpl : public ::cppu::WeakImplHelper< +class XSECXMLSEC_DLLPUBLIC XMLSignature_GpgImpl final : public ::cppu::WeakImplHelper< css::xml::crypto::XXMLSignature , css::lang::XServiceInfo > { diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 88d1c18a325d..ef17e3b20efe 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -32,7 +32,7 @@ namespace xml { namespace crypto { class MacroSecurityTP; -class MacroSecurity : public weld::GenericDialogController +class MacroSecurity final : public weld::GenericDialogController { private: friend class MacroSecurityLevelTP; diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 86b60f33cb57..ed984cfa176e 100644 --- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -34,7 +34,7 @@ #include <libxml/tree.h> -class XSECXMLSEC_DLLPUBLIC XMLDocumentWrapper_XmlSecImpl : public cppu::WeakImplHelper +class XSECXMLSEC_DLLPUBLIC XMLDocumentWrapper_XmlSecImpl final : public cppu::WeakImplHelper < css::xml::wrapper::XXMLDocumentWrapper, css::xml::sax::XDocumentHandler, diff --git a/xmlsecurity/inc/xmlsignaturehelper2.hxx b/xmlsecurity/inc/xmlsignaturehelper2.hxx index 340d1e54dd1c..928ea19ed3fa 100644 --- a/xmlsecurity/inc/xmlsignaturehelper2.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper2.hxx @@ -37,7 +37,7 @@ namespace embed { // XUriBinding -class UriBindingHelper : public cppu::WeakImplHelper< css::xml::crypto::XUriBinding > +class UriBindingHelper final : public cppu::WeakImplHelper< css::xml::crypto::XUriBinding > { private: css::uno::Reference < css::embed::XStorage > mxStorage; diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx index 351c94a2a3e6..eed8b9782870 100644 --- a/xmlsecurity/inc/xsecctl.hxx +++ b/xmlsecurity/inc/xsecctl.hxx @@ -91,7 +91,7 @@ public: } }; -class XSecController : public cppu::WeakImplHelper +class XSecController final : public cppu::WeakImplHelper < css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener, css::xml::crypto::sax::XSignatureCreationResultListener, |