[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Jun 15 07:38:17 UTC 2016
writerfilter/source/filter/RtfFilter.cxx | 18 +++++++++---------
writerfilter/source/filter/WriterFilter.cxx | 18 +++++++++---------
writerfilter/source/filter/WriterFilterDetection.cxx | 10 +++++-----
3 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 637371d4d90c2403f02d588ebe745368014b1032
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jun 15 09:05:46 2016 +0200
writerfilter: clean up virtual keywords where override already implies that
Change-Id: I04938ceba4e4740535caee396ca8e13ca50a003c
Reviewed-on: https://gerrit.libreoffice.org/26288
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 954a674..e734fb6 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -53,25 +53,25 @@ class RtfFilter : public cppu::WeakImplHelper
public:
explicit RtfFilter(const uno::Reference<uno::XComponentContext>& xContext);
- virtual ~RtfFilter();
+ ~RtfFilter() override;
// XFilter
- virtual sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
+ void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
// XImporter
- virtual void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
// XExporter
- virtual void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+ void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override;
- virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
};
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 2ed8c10..b96ed5e 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -98,25 +98,25 @@ public:
explicit WriterFilter(const uno::Reference<uno::XComponentContext>& rxContext)
: m_xContext(rxContext)
{}
- virtual ~WriterFilter() = default;
+ ~WriterFilter() override = default;
// XFilter
- virtual sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
+ void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
// XImporter
- virtual void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
// XExporter
- virtual void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+ void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
- virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
private:
void putPropertiesToDocumentGrabBag(const comphelper::SequenceAsHashMap& rProperties);
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 3cd2dad..442eaf0 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -35,15 +35,15 @@ class WriterFilterDetection : public cppu::WeakImplHelper
{
public:
explicit WriterFilterDetection();
- virtual ~WriterFilterDetection();
+ ~WriterFilterDetection() override;
//XExtendedFilterDetection
- virtual OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) throw (uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
- virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
};
uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException);
More information about the Libreoffice-commits
mailing list