diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-28 10:00:30 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-28 13:01:25 +0200 |
commit | 867a22fd199e732803c9050fe9f84ad630ec27fb (patch) | |
tree | 4a33f2084c10a5d96def0039c9374073106bbe5b | |
parent | 149a4d756699f4275f9f84807e72526e73aed1b2 (diff) |
loplugin:virtualdown in xmloff/xmlsecurity
Change-Id: I884fe180be98fe29ddb7d2daf4c61f733236e8bd
Reviewed-on: https://gerrit.libreoffice.org/51987
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | xmloff/source/transform/ChartPlotAreaOOoTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/DeepTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/FlatTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/PersAttrListTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerContext.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerContext.hxx | 3 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/securityengine.hxx | 6 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureengine.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureverifierimpl.hxx | 2 |
11 files changed, 8 insertions, 22 deletions
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index 93388283dacb..1554fe6b2ff3 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -43,7 +43,7 @@ public: const OUString& rQName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual void ExportContent() override; + void ExportContent(); private: void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent ); diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index efbed3b40415..c846fdb7c3ef 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -66,7 +66,7 @@ public: return !m_aChildContexts.empty(); } - virtual void ExportContent() override; + void ExportContent(); }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_DEEPTCONTEXT_HXX diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index 06d525c76df6..44a8c080adcf 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -51,7 +51,7 @@ public: // current element. virtual void Characters( const OUString& rChars ) override; - virtual void ExportContent() override; + void ExportContent(); const OUString& GetTextContent() const { return m_aCharacters; } }; diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 1112376503ce..0d91cc92ab31 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -84,7 +84,7 @@ public: virtual bool IsPersistent() const override; virtual void Export() override; - virtual void ExportContent() override; + void ExportContent(); const OUString& GetExportQName() const { return m_aElemQName; } diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index 081bacedb436..4a07fcc1fcc8 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -54,7 +54,7 @@ public: virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; - virtual void ExportContent() override; + void ExportContent(); virtual bool IsPersistent() const override; diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index fd4005d73274..6a65ba145c75 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -85,9 +85,4 @@ void XMLTransformerContext::Export() OSL_ENSURE( false, "context is not persistent" ); } -void XMLTransformerContext::ExportContent() -{ - OSL_ENSURE( false, "context is not persistent" ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 0a2446f252d4..07b0dbcb04b4 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -91,9 +91,6 @@ public: // Export the whole element. By default, nothing is done here virtual void Export(); - - // Export the element content. By default, nothing is done here - virtual void ExportContent(); }; diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx index dbb4dbfe5777..6e40d7fd8b53 100644 --- a/xmlsecurity/inc/framework/securityengine.hxx +++ b/xmlsecurity/inc/framework/securityengine.hxx @@ -129,12 +129,6 @@ protected: virtual void notifyResultListener() const {}; - /* - * checks whether everything is ready. - * Any derived class will implement this method respectively. - */ - virtual bool checkReady() const { return true; }; - public: /* XReferenceResolvedListener */ virtual void SAL_CALL referenceResolved( sal_Int32 referenceId ) override; diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index b7fffec12c6c..8637f29395bf 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -61,7 +61,7 @@ private: virtual void notifyResultListener() const override; virtual void clearUp( ) const override; - virtual bool checkReady() const override; + bool checkReady() const; virtual void startEngine( const rtl::Reference<XMLSignatureTemplateImpl>& xSignatureTemplate) override; public: diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index 62c0c5c5f24f..f1f53d4412a0 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -90,7 +90,7 @@ protected: virtual void tryToPerform( ) override; virtual void clearUp( ) const override; - virtual bool checkReady() const override; + bool checkReady() const; /* * starts the main function. This method will be implemented by any sub-class. diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index d3b8c8e166f6..7c609804aa85 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -55,7 +55,7 @@ private: css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext; virtual void notifyResultListener() const override; - virtual bool checkReady() const override; + bool checkReady() const; virtual void startEngine( const rtl::Reference<XMLSignatureTemplateImpl>& xSignatureTemplate) override; public: |