diff options
Diffstat (limited to 'filter')
58 files changed, 345 insertions, 345 deletions
diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx index 11e510334542..03836311dafd 100644 --- a/filter/qa/cppunit/filters-dxf-test.cxx +++ b/filter/qa/cppunit/filters-dxf-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx index 79e81f52196e..271f24fc2f98 100644 --- a/filter/qa/cppunit/filters-eps-test.cxx +++ b/filter/qa/cppunit/filters-eps-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx index 7607463f7245..63619c106634 100644 --- a/filter/qa/cppunit/filters-met-test.cxx +++ b/filter/qa/cppunit/filters-met-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx index 4ce202ef74b5..3f66c24d46fd 100644 --- a/filter/qa/cppunit/filters-pcd-test.cxx +++ b/filter/qa/cppunit/filters-pcd-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx index cd724781ff97..395d95409f10 100644 --- a/filter/qa/cppunit/filters-pcx-test.cxx +++ b/filter/qa/cppunit/filters-pcx-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index bdfa9c2134b9..16b4b20a5c1b 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -42,7 +42,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; OUString pictURL() { diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx index 10f265888964..304d759eb27c 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/filter/qa/cppunit/filters-ppm-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx index ea2bc1ee34c1..330856dda15e 100644 --- a/filter/qa/cppunit/filters-psd-test.cxx +++ b/filter/qa/cppunit/filters-psd-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx index a7f2a6952e2e..df482f5c9bfb 100644 --- a/filter/qa/cppunit/filters-ras-test.cxx +++ b/filter/qa/cppunit/filters-ras-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index 28b24507d908..aadbb9c6a4b9 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index d4218a53dfc5..133044550e2b 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -36,7 +36,7 @@ public: virtual bool load(const OUString &, const OUString &rURL, const OUString &, - SfxFilterFlags, SotClipboardFormatId, unsigned int) SAL_OVERRIDE; + SfxFilterFlags, SotClipboardFormatId, unsigned int) override; /** * Ensure CVEs remain unbroken diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx index a424c989c148..6c696801be07 100644 --- a/filter/qa/cppunit/xslt-test.cxx +++ b/filter/qa/cppunit/xslt-test.cxx @@ -57,11 +57,11 @@ struct Listener : public ::cppu::WeakImplHelper<io::XStreamListener> Listener() : m_bDone(false) {} - virtual void SAL_CALL disposing(const lang::EventObject&) throw() SAL_OVERRIDE {} - virtual void SAL_CALL started() throw() SAL_OVERRIDE { m_bDone = false; } - virtual void SAL_CALL closed() throw() SAL_OVERRIDE { m_bDone = true; } - virtual void SAL_CALL terminated() throw() SAL_OVERRIDE { m_bDone = true; } - virtual void SAL_CALL error(const uno::Any& e) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL disposing(const lang::EventObject&) throw() override {} + virtual void SAL_CALL started() throw() override { m_bDone = false; } + virtual void SAL_CALL closed() throw() override { m_bDone = true; } + virtual void SAL_CALL terminated() throw() override { m_bDone = true; } + virtual void SAL_CALL error(const uno::Any& e) throw(uno::RuntimeException, std::exception) override { m_bDone = true; // set on error too, otherwise main thread waits forever SAL_WARN("filter.xslt", "exception " << e); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index cf42c4042729..79c7aff77b60 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -215,13 +215,13 @@ class BaseContainer : public BaseLock // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XNameContainer @@ -231,12 +231,12 @@ class BaseContainer : public BaseLock throw (css::lang::IllegalArgumentException , css::container::ElementExistException, css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; // XNameReplace @@ -246,7 +246,7 @@ class BaseContainer : public BaseLock throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; // XElementAccess @@ -254,19 +254,19 @@ class BaseContainer : public BaseLock virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XContainerQuery @@ -275,22 +275,22 @@ class BaseContainer : public BaseLock // We implement return of an empty result here only! // But we show an assertion :-) virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XFlushable virtual void SAL_CALL flush() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace config diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 4429a246f8a4..9a9704c52629 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -109,12 +109,12 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante // XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; }; } // namespace config diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 3d58adc63383..413561c3f9c6 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -84,25 +84,25 @@ class ConfigFlush : public BaseLock // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XRefreshable virtual void SAL_CALL refresh() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // interface to register/create this instance as an UNO service diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 5b45faf0cf5d..e9e949d4190d 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -71,15 +71,15 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // static uno helper! @@ -128,21 +128,21 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine // Overrides to resolve ambiguity - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return BaseContainer::getByName(aName); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::hasByName(aName); } - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::hasElements(); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::createSubSetEnumerationByProperties(Properties); } diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 0144bf545eb5..8125bda72cac 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -72,21 +72,21 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XContainerQuery virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // internal helper! diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index bd477e20c8b4..c9c4cd30b0d5 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -71,15 +71,15 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // static uno helper! @@ -127,21 +127,21 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); // Overrides to resolve ambiguity - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { return BaseContainer::getByName(aName); } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::hasByName(aName); } - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::hasElements(); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery( const ::rtl::OUString& Query ) throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::createSubSetEnumerationByQuery(Query); } - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties( const css::uno::Sequence< css::beans::NamedValue >& Properties ) throw (css::uno::RuntimeException, std::exception) override { return BaseContainer::createSubSetEnumerationByProperties(Properties); } }; diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index 194aadf8c3b4..def8863c5e36 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -328,11 +328,11 @@ public: // XTypeDetection virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // static uno helper! diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 259d5a6cdaad..d21e2a384639 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -58,7 +58,7 @@ public: ImpSWFDialog( vcl::Window* pParent, css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); virtual ~ImpSWFDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Sequence< css::beans::PropertyValue > GetFilterData(); }; diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 66792bd97e2e..6d6cb84d01ca 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -46,28 +46,28 @@ private: protected: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // OGenericUnoDialog - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) SAL_OVERRIDE; - virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override; + virtual void executedDialog( sal_Int16 nExecutionResult ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XPropertyAccess using ::cppu::OPropertySetHelper::getPropertyValues; using ::cppu::OPropertySetHelper::setPropertyValues; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; public: diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 5fd0e6e231b8..e866ef275bc5 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -74,9 +74,9 @@ public: } // css::io::XOutputStream - virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; }; void SAL_CALL OslOutputStreamWrapper::writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) @@ -158,23 +158,23 @@ public: explicit FlashExportFilter( const Reference< XComponentContext > &rxContext); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override; bool ExportAsMultipleFiles( const Sequence< PropertyValue >& aDescriptor ); bool ExportAsSingleFile( const Sequence< PropertyValue >& aDescriptor ); - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; }; FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxContext) diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx index c383bad1c0b0..2e1726e862c5 100644 --- a/filter/source/graphic/GraphicExportDialog.hxx +++ b/filter/source/graphic/GraphicExportDialog.hxx @@ -57,21 +57,21 @@ public: virtual ~GraphicExportDialog(); // XInitialization - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw (Exception, RuntimeException, std::exception ) override; // XPropertyAccess - virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence<PropertyValue> SAL_CALL getPropertyValues() throw ( RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValues( const Sequence<PropertyValue>& aProps ) throw ( UnknownPropertyException, PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - RuntimeException, std::exception ) SAL_OVERRIDE; + RuntimeException, std::exception ) override; // XExecuteDialog - virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute() throw ( RuntimeException, std::exception ) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw ( RuntimeException, std::exception ) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference<lang::XComponent>& xDocument ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception ) override; }; diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx index 5f349a792517..157993754c16 100644 --- a/filter/source/graphic/GraphicExportFilter.hxx +++ b/filter/source/graphic/GraphicExportFilter.hxx @@ -61,14 +61,14 @@ public: virtual ~GraphicExportFilter(); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) throw(Exception, RuntimeException, std::exception) override; }; #endif diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index 22c71a080073..0ad0202edff1 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -64,7 +64,7 @@ public: , nLineWidth(0) {} - virtual Bundle* Clone() SAL_OVERRIDE { return new LineBundle( *this ); } + virtual Bundle* Clone() override { return new LineBundle( *this ); } LineBundle& operator=( LineBundle& rLineBundle ); }; @@ -82,7 +82,7 @@ public: , nMarkerSize( 0.0 ) {}; - virtual Bundle* Clone() SAL_OVERRIDE { return new MarkerBundle( *this ); } ; + virtual Bundle* Clone() override { return new MarkerBundle( *this ); } ; MarkerBundle& operator=( MarkerBundle& rMarkerBundle ); virtual ~MarkerBundle() {}; }; @@ -100,7 +100,7 @@ public: : eEdgeType(ET_NONE) , nEdgeWidth(0) {} - virtual Bundle* Clone() SAL_OVERRIDE { return new EdgeBundle( *this ); } + virtual Bundle* Clone() override { return new EdgeBundle( *this ); } EdgeBundle& operator=( EdgeBundle& rEdgeBundle ); }; @@ -122,7 +122,7 @@ public: , nCharacterSpacing( 0.0 ) {}; - virtual Bundle* Clone() SAL_OVERRIDE { return new TextBundle( *this ); } ; + virtual Bundle* Clone() override { return new TextBundle( *this ); } ; TextBundle& operator=( TextBundle& rTextBundle ); virtual ~TextBundle() {}; }; @@ -142,7 +142,7 @@ public: , nFillPatternIndex(0) , nFillHatchIndex(0) {} - virtual Bundle* Clone() SAL_OVERRIDE { return new FillBundle( *this ); } + virtual Bundle* Clone() override { return new FillBundle( *this ); } FillBundle& operator=( FillBundle& rFillBundle ); }; diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index a7e24e73ab56..1021edc5f154 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -113,22 +113,22 @@ class CGMImpressOutAct : public CGMOutAct public: CGMImpressOutAct( CGM&, const css::uno::Reference< css::frame::XModel > & ) ; virtual ~CGMImpressOutAct() {} ; - virtual void InsertPage() SAL_OVERRIDE ; - virtual void BeginGroup() SAL_OVERRIDE ; - virtual void EndGroup() SAL_OVERRIDE ; - virtual void EndGrouping() SAL_OVERRIDE ; - virtual void DrawRectangle( FloatRect& ) SAL_OVERRIDE ; - virtual void DrawEllipse( FloatPoint& center, FloatPoint&, double& Orientation ) SAL_OVERRIDE ; + virtual void InsertPage() override ; + virtual void BeginGroup() override ; + virtual void EndGroup() override ; + virtual void EndGrouping() override ; + virtual void DrawRectangle( FloatRect& ) override ; + virtual void DrawEllipse( FloatPoint& center, FloatPoint&, double& Orientation ) override ; virtual void DrawEllipticalArc( FloatPoint& center, FloatPoint& size, double& orientation, - sal_uInt32 etype, double& startangle, double& endangle ) SAL_OVERRIDE ; - virtual void DrawBitmap( CGMBitmapDescriptor* ) SAL_OVERRIDE ; - virtual void DrawPolygon( tools::Polygon& ) SAL_OVERRIDE ; - virtual void DrawPolyLine( tools::Polygon& ) SAL_OVERRIDE ; - virtual void DrawPolybezier( tools::Polygon& ) SAL_OVERRIDE ; - virtual void DrawPolyPolygon( tools::PolyPolygon& ) SAL_OVERRIDE ; - virtual void DrawText( css::awt::Point& TextRectPos, css::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; - virtual void AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) SAL_OVERRIDE ; - virtual void DrawChart() SAL_OVERRIDE; + sal_uInt32 etype, double& startangle, double& endangle ) override ; + virtual void DrawBitmap( CGMBitmapDescriptor* ) override ; + virtual void DrawPolygon( tools::Polygon& ) override ; + virtual void DrawPolyLine( tools::Polygon& ) override ; + virtual void DrawPolybezier( tools::Polygon& ) override ; + virtual void DrawPolyPolygon( tools::PolyPolygon& ) override ; + virtual void DrawText( css::awt::Point& TextRectPos, css::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) override ; + virtual void AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) override ; + virtual void DrawChart() override; }; diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index eeeee6e0d64c..603d43fd4356 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -103,7 +103,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFPointEntity : public DXFBasicEntity { @@ -116,7 +116,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFCircleEntity : public DXFBasicEntity { @@ -130,7 +130,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFArcEntity : public DXFBasicEntity { @@ -146,7 +146,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFTraceEntity : public DXFBasicEntity { @@ -162,7 +162,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFSolidEntity : public DXFBasicEntity { @@ -178,7 +178,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFTextEntity : public DXFBasicEntity { @@ -201,7 +201,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFShapeEntity : public DXFBasicEntity { @@ -219,7 +219,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFInsertEntity : public DXFBasicEntity { @@ -242,7 +242,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFAttDefEntity : public DXFBasicEntity { @@ -269,7 +269,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFAttribEntity : public DXFBasicEntity { @@ -295,7 +295,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFPolyLineEntity : public DXFBasicEntity { @@ -316,7 +316,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFLWPolyLineEntity : public DXFBasicEntity @@ -338,7 +338,7 @@ class DXFLWPolyLineEntity : public DXFBasicEntity protected: - virtual void EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; + virtual void EvaluateGroup( DXFGroupReader & rDGR ) override; }; @@ -359,7 +359,7 @@ struct DXFEdgeTypeLine : public DXFEdgeType DXFVector aEndPoint; // 11,21 DXFEdgeTypeLine(); virtual ~DXFEdgeTypeLine(); - virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; + virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFEdgeTypeCircularArc : public DXFEdgeType { @@ -370,7 +370,7 @@ struct DXFEdgeTypeCircularArc : public DXFEdgeType sal_Int32 nIsCounterClockwiseFlag; // 73 DXFEdgeTypeCircularArc(); virtual ~DXFEdgeTypeCircularArc(); - virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; + virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFEdgeTypeEllipticalArc : public DXFEdgeType { @@ -383,7 +383,7 @@ struct DXFEdgeTypeEllipticalArc : public DXFEdgeType DXFEdgeTypeEllipticalArc(); virtual ~DXFEdgeTypeEllipticalArc(); - virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; + virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFEdgeTypeSpline : public DXFEdgeType { @@ -395,7 +395,7 @@ struct DXFEdgeTypeSpline : public DXFEdgeType DXFEdgeTypeSpline(); virtual ~DXFEdgeTypeSpline(); - virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; + virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; struct DXFBoundaryPathData @@ -448,7 +448,7 @@ class DXFHatchEntity : public DXFBasicEntity protected: - virtual void EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; + virtual void EvaluateGroup( DXFGroupReader & rDGR ) override; }; class DXFVertexEntity : public DXFBasicEntity { @@ -466,7 +466,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFSeqEndEntity : public DXFBasicEntity { @@ -490,7 +490,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; class DXFDimensionEntity : public DXFBasicEntity { @@ -503,7 +503,7 @@ public: protected: - virtual void EvaluateGroup(DXFGroupReader & rDGR) SAL_OVERRIDE; + virtual void EvaluateGroup(DXFGroupReader & rDGR) override; }; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 7629b86ea630..6e72a901a661 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4960,11 +4960,11 @@ SvStream* EscherExGlobal::ImplQueryPictureStream() class SvNullStream : public SvStream { protected: - virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE { memset( pData, 0, nSize ); return nSize; } - virtual sal_Size PutData( const void*, sal_Size nSize ) SAL_OVERRIDE { return nSize; } - virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE { return nPos; } - virtual void SetSize( sal_uInt64 ) SAL_OVERRIDE {} - virtual void FlushData() SAL_OVERRIDE {} + virtual sal_Size GetData( void* pData, sal_Size nSize ) override { memset( pData, 0, nSize ); return nSize; } + virtual sal_Size PutData( const void*, sal_Size nSize ) override { return nSize; } + virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override { return nPos; } + virtual void SetSize( sal_uInt64 ) override {} + virtual void FlushData() override {} public: SvNullStream() : SvStream() {} diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 813dd2acfb6a..199d8a729144 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -72,7 +72,7 @@ namespace filter { importer(const Sequence< PropertyValue >& sourceData, const Reference< XDocumentHandler >& docHandler, const Sequence< OUString >& userData) - throw (IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (IllegalArgumentException, RuntimeException, std::exception) override; // XExportFilter virtual sal_Bool SAL_CALL @@ -80,18 +80,18 @@ namespace filter { const Sequence< PropertyValue >& sourceData, const Sequence< OUString >& userData) throw (IllegalArgumentException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return OUString("com.sun.star.comp.filter.OdfFlatXml"); } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return css::uno::Sequence<OUString>{ "com.sun.star.document.ImportFilter", diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 97eedd165a6f..f4d916ec92de 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -63,7 +63,7 @@ class ImplErrorDialog : public MessageDialog public: explicit ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& ); virtual ~ImplErrorDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class ImpPDFTabSecurityPage; @@ -172,7 +172,7 @@ public: const css::uno::Reference< XComponent >& rDoc ); virtual ~ImpPDFTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; Sequence< PropertyValue > GetFilterData(); @@ -182,8 +182,8 @@ public: protected: virtual void PageCreated( sal_uInt16 _nId, - SfxTabPage& _rPage ) SAL_OVERRIDE; - virtual short Ok() SAL_OVERRIDE; + SfxTabPage& _rPage ) override; + virtual short Ok() override; }; //class tab page general @@ -245,7 +245,7 @@ public: ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabGeneralPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); @@ -287,7 +287,7 @@ public: const SfxItemSet& rSet ); virtual ~ImpPDFTabOpnFtrPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -321,7 +321,7 @@ public: const SfxItemSet& rSet ); virtual ~ImpPDFTabViewerPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -377,7 +377,7 @@ public: const SfxItemSet& rSet ); virtual ~ImpPDFTabSecurityPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -409,7 +409,7 @@ public: const SfxItemSet& rSet ); virtual ~ImpPDFTabLinksPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); @@ -440,7 +440,7 @@ public: const SfxItemSet& rSet ); virtual ~ImpPDFTabSigningPage(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index c587a0c26a44..f10e0430a696 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -47,23 +47,23 @@ private: protected: // OGenericUnoDialog - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) SAL_OVERRIDE; - virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; - virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) override; + virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override; + virtual void executedDialog( sal_Int16 nExecutionResult ) override; + virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XPropertyAccess using OPropertySetHelper::getPropertyValues; - virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< PropertyValue > SAL_CALL getPropertyValues( ) throw (RuntimeException, std::exception) override; using OPropertySetHelper::setPropertyValues; - virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const Sequence< PropertyValue >& aProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; public: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 0881c7389340..2599e535d167 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -269,7 +269,7 @@ class PDFExportStreamDoc : public vcl::PDFOutputStream {} virtual ~PDFExportStreamDoc(); - virtual void write( const Reference< XOutputStream >& xStream ) SAL_OVERRIDE; + virtual void write( const Reference< XOutputStream >& xStream ) override; }; PDFExportStreamDoc::~PDFExportStreamDoc() @@ -972,8 +972,8 @@ public: explicit PDFErrorRequest( const task::PDFExportException& i_rExc ); // XInteractionRequest - virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) override; + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) override; }; PDFErrorRequest::PDFErrorRequest( const task::PDFExportException& i_rExc ) : diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 99348b33e536..637fb3937b99 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -67,19 +67,19 @@ private: protected: // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; public: diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx index 3f1664f56140..99a80cca3be0 100644 --- a/filter/source/pdf/pdfinteract.hxx +++ b/filter/source/pdf/pdfinteract.hxx @@ -38,15 +38,15 @@ class PDFInteractionHandler : public cppu::WeakImplHelper < task::XInteractionHa { protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; // XIniteractionHandler - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) override; // XIniteractionHandler2 - virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL handleInteractionRequest( const Reference< task::XInteractionRequest >& ) throw(RuntimeException, std::exception) override; public: PDFInteractionHandler(); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 9b9fec8a9d18..78caa2f6be14 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -56,19 +56,19 @@ public: explicit PlaceWareExportFilter( const Reference< XComponentContext > &rxContext); // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; }; diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx index 85c2a9ed46a6..fa026aa62b03 100644 --- a/filter/source/storagefilterdetect/filterdetect.hxx +++ b/filter/source/storagefilterdetect/filterdetect.hxx @@ -41,21 +41,21 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; OUString StorageFilterDetect_getImplementationName(); diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 8d737daa741d..2d7be2ff33e6 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -67,7 +67,7 @@ public: ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/ css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); virtual ~ImpSVGDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; css::uno::Sequence< css::beans::PropertyValue > GetFilterData(); }; diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index a3aeed32758f..5b88b842cd39 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -48,28 +48,28 @@ private: protected: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // OGenericUnoDialog - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) SAL_OVERRIDE; - virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual VclPtr<Dialog> createDialog( vcl::Window* pParent ) override; + virtual void executedDialog( sal_Int16 nExecutionResult ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XPropertyAccess using cppu::OPropertySetHelper::getPropertyValues; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; using cppu::OPropertySetHelper::setPropertyValues; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; public: diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 071b7a7fe663..f087fa64dda1 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -145,11 +145,11 @@ class FixedTextField : public TextField public: OUString text; - virtual OUString getClassName() const SAL_OVERRIDE + virtual OUString getClassName() const override { return OUString( "FixedTextField" ); } - virtual bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE + virtual bool equalTo( const TextField & aTextField ) const override { if( const FixedTextField* aFixedTextField = dynamic_cast< const FixedTextField* >( &aTextField ) ) { @@ -157,7 +157,7 @@ public: } return false; } - virtual void elementExport( SVGExport* pSVGExport ) const SAL_OVERRIDE + virtual void elementExport( SVGExport* pSVGExport ) const override { TextField::elementExport( pSVGExport ); SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true ); @@ -170,11 +170,11 @@ class FixedDateTimeField : public FixedTextField { public: FixedDateTimeField() {} - virtual OUString getClassName() const SAL_OVERRIDE + virtual OUString getClassName() const override { return OUString( "FixedDateTimeField" ); } - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override { implGrowCharSet( aTextFieldCharSets, text, aOOOAttrDateTimeField ); } @@ -185,11 +185,11 @@ class FooterField : public FixedTextField { public: FooterField() {} - virtual OUString getClassName() const SAL_OVERRIDE + virtual OUString getClassName() const override { return OUString( "FooterField" ); } - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override { static const OUString sFieldId = aOOOAttrFooterField; implGrowCharSet( aTextFieldCharSets, text, sFieldId ); @@ -200,7 +200,7 @@ public: class VariableTextField : public TextField { public: - virtual OUString getClassName() const SAL_OVERRIDE + virtual OUString getClassName() const override { return OUString( "VariableTextField" ); } @@ -216,11 +216,11 @@ public: : format(0) { } - virtual OUString getClassName() const SAL_OVERRIDE + virtual OUString getClassName() const override { return OUString( "VariableDateTimeField" ); } - virtual bool equalTo( const TextField & aTextField ) const SAL_OVERRIDE + virtual bool equalTo( const TextField & aTextField ) const override { if( const VariableDateTimeField* aField = dynamic_cast< const VariableDateTimeField* >( &aTextField ) ) { @@ -228,7 +228,7 @@ public: } return false; } - virtual void elementExport( SVGExport* pSVGExport ) const SAL_OVERRIDE + virtual void elementExport( SVGExport* pSVGExport ) const override { VariableTextField::elementExport( pSVGExport ); OUString sDateFormat, sTimeFormat; @@ -291,7 +291,7 @@ public: pSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrDateTimeFormat, sDateTimeFormat ); SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true ); } - virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const SAL_OVERRIDE + virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override { // we use the unicode char set in an improper way: we put in the date/time format // in order to pass it to the CalcFieldValue method diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 206c42a2b85d..b2f850dfd236 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -114,11 +114,11 @@ public: protected: - virtual void _ExportStyles( bool /* bUsed */ ) SAL_OVERRIDE {} - virtual void _ExportAutoStyles() SAL_OVERRIDE {} - virtual void _ExportContent() SAL_OVERRIDE {} - virtual void _ExportMasterStyles() SAL_OVERRIDE {} - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) SAL_OVERRIDE { return 0; } + virtual void _ExportStyles( bool /* bUsed */ ) override {} + virtual void _ExportAutoStyles() override {} + virtual void _ExportContent() override {} + virtual void _ExportMasterStyles() override {} + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum /* eClass */ ) override { return 0; } private: @@ -298,17 +298,17 @@ private: protected: // XFilter - virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception) override; // XImporter - virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XExporter - virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) override; // XExtendedFilterDetection - virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception) override; public: diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 46730a20ddc3..a9938f2b494f 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -387,7 +387,7 @@ public: // XSVGWriter virtual void SAL_CALL write( const Reference<XDocumentHandler>& rxDocHandler, - const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception ) override; }; #endif diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx index 7675af34251c..3f0683a8aebd 100644 --- a/filter/source/svg/test/odfserializer.cxx +++ b/filter/source/svg/test/odfserializer.cxx @@ -47,14 +47,14 @@ public: m_aLineFeed[0] = '\n'; } - virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) override; private: uno::Reference<io::XOutputStream> m_xOutStream; diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 63ca8ba152e4..46771bdce101 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -46,18 +46,18 @@ namespace maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } - virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { } - virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override { maFile.close(); } diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index e9a90955994e..d0d9d93a1cff 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -108,34 +108,34 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL execute() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XLocalizable virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; virtual css::lang::Locale SAL_CALL getLocale() - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPropertyAccess virtual css::uno::Sequence< css::beans::PropertyValue > - SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; public: explicit T602ImportFilterDialog(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); @@ -260,30 +260,30 @@ private: // XFilter virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE {}; + throw (css::uno::RuntimeException, std::exception) override {}; // XImporter virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XExtendedTypeDetection virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& Descriptor ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; bool SAL_CALL test(); }; diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index 3b2983b1b7f6..343432b44c22 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -42,23 +42,23 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect(css::uno::Sequence<css::beans::PropertyValue>& lDescriptor) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; OUString PlainTextFilterDetect_getImplementationName(); diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index aee1cc236864..422e9d5a0e99 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -84,17 +84,17 @@ public: // XFilter virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL cancel( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XExporter virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; @@ -102,7 +102,7 @@ public: virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; @@ -110,7 +110,7 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; @@ -118,15 +118,15 @@ public: virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx index d1ea5ad31ead..1f57e31573e0 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.hxx +++ b/filter/source/xmlfilteradaptor/streamwrap.hxx @@ -45,9 +45,9 @@ public: explicit OOutputStreamWrapper(osl::File& _rStream) :rStream(_rStream) { } // css::io::XOutputStream - virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; }; } // namespace utl diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index de55eaac06d6..299f519ecb48 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -47,21 +47,21 @@ public: //XExtendedFilterDetection virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; OUString SAL_CALL FilterDetect_getImplementationName(); diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index f0ddd7584563..fcc668e96454 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -67,21 +67,21 @@ public: static void doImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference < css::io::XInputStream > xOS, XMLFilterVector& rFilters ); virtual void SAL_CALL startDocument( ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument( ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement( const OUString& aName ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& aChars ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; private: void fillFilterVector( XMLFilterVector& rFilters ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 44aa2b8e5c52..c8d36a723fdb 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -73,35 +73,35 @@ public: protected: // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; /** Called in dispose method after the listeners were notified. */ - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; private: css::uno::Reference<css::awt::XWindow> mxParent; /// parent window diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 1eebb9c110f6..6b4e8d238cd9 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -43,16 +43,16 @@ private: VclPtr<HeaderBar> m_pHeaderBar; VclPtr<XMLFilterListBox> m_pFocusCtrl; protected: - virtual void Resize() SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() override; + virtual Size GetOptimalSize() const override; public: explicit SvxPathControl(vcl::Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } XMLFilterListBox* getListBox() { return m_pFocusCtrl; } virtual ~SvxPathControl(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; }; class HeaderBar; @@ -70,14 +70,14 @@ private: public: XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl); virtual ~XMLFilterListBox(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; /** adds a new filter info entry to the ui filter list */ void addFilterEntry( const filter_info_impl* pInfo ); void changeEntry( const filter_info_impl* pInfo ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; }; @@ -89,13 +89,13 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext, Dialog::InitFlag eFlag = Dialog::InitFlag::Default); virtual ~XMLFilterSettingsDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED(DoubleClickHdl_Impl, SvTreeListBox*, bool ); - virtual short Execute() SAL_OVERRIDE; + virtual short Execute() override; void onNew(); void onEdit(); @@ -107,7 +107,7 @@ public: void updateStates(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) override; bool isClosable() { return m_bIsClosable;} diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index a853a1472e96..067a22ac9d22 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -36,7 +36,7 @@ class XMLFilterTabDialog: public TabDialog public: XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); virtual ~XMLFilterTabDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool onOk(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index 6bd2b91b52bd..cc90664cc457 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -34,7 +34,7 @@ class XMLFilterTabPageBasic : public TabPage public: explicit XMLFilterTabPageBasic(vcl::Window* pParent); virtual ~XMLFilterTabPageBasic(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 5a1f29a090f2..054f3e1b0f2c 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -35,7 +35,7 @@ class XMLFilterTabPageXSLT : public TabPage public: explicit XMLFilterTabPageXSLT(vcl::Window* pParent); virtual ~XMLFilterTabPageXSLT(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; bool FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index e6f149b906e1..eddaf829e023 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -74,10 +74,10 @@ public: explicit GlobalEventListenerImpl( XMLFilterTestDialog* pDialog ); // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (RuntimeException, std::exception) override; // lang::XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) override; private: VclPtr<XMLFilterTestDialog> mpDialog; }; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 3a8b119d6753..c5ee4201e52b 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -37,7 +37,7 @@ public: XMLFilterTestDialog(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext); virtual ~XMLFilterTestDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void test( const filter_info_impl& rFilterInfo ); diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index f998153075b8..2e3280a8e99d 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -105,28 +105,28 @@ namespace XSLT // XActiveDataSink virtual void SAL_CALL setInputStream(const css::uno::Reference<XInputStream>& inputStream) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual css::uno::Reference<XInputStream> SAL_CALL - getInputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getInputStream() throw (RuntimeException, std::exception) override; // XActiveDataSource virtual void SAL_CALL setOutputStream(const css::uno::Reference<XOutputStream>& outputStream) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual css::uno::Reference<XOutputStream> SAL_CALL - getOutputStream() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getOutputStream() throw (RuntimeException, std::exception) override; // XActiveDataControl virtual void SAL_CALL addListener(const css::uno::Reference<XStreamListener>& listener) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual void SAL_CALL removeListener(const css::uno::Reference<XStreamListener>& listener) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual void SAL_CALL - start() throw (RuntimeException, std::exception) SAL_OVERRIDE; + start() throw (RuntimeException, std::exception) override; virtual void SAL_CALL - terminate() throw (RuntimeException, std::exception) SAL_OVERRIDE; + terminate() throw (RuntimeException, std::exception) override; virtual void SAL_CALL - initialize(const Sequence<Any>& params) throw (RuntimeException, std::exception) SAL_OVERRIDE; + initialize(const Sequence<Any>& params) throw (RuntimeException, std::exception) override; void SAL_CALL done(); @@ -173,7 +173,7 @@ namespace XSLT Sequence<sal_Int8> m_readBuf; Sequence<sal_Int8> m_writeBuf; - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; static void SAL_CALL registerExtensionModule(); }; diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 71442c743e42..403debb29597 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -130,32 +130,32 @@ namespace XSLT // XStreamListener virtual void SAL_CALL - error(const Any& a) throw (RuntimeException, std::exception) SAL_OVERRIDE; + error(const Any& a) throw (RuntimeException, std::exception) override; virtual void SAL_CALL - closed() throw (RuntimeException, std::exception) SAL_OVERRIDE; + closed() throw (RuntimeException, std::exception) override; virtual void SAL_CALL - terminated() throw (RuntimeException, std::exception) SAL_OVERRIDE; + terminated() throw (RuntimeException, std::exception) override; virtual void SAL_CALL - started() throw (RuntimeException, std::exception) SAL_OVERRIDE; + started() throw (RuntimeException, std::exception) override; virtual void SAL_CALL - disposing(const EventObject& e) throw (RuntimeException, std::exception) SAL_OVERRIDE; + disposing(const EventObject& e) throw (RuntimeException, std::exception) override; // XImportFilter virtual sal_Bool SAL_CALL importer(const Sequence<PropertyValue>& aSourceData, const css::uno::Reference< XDocumentHandler>& xHandler, - const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception) SAL_OVERRIDE; + const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception) override; // XExportFilter virtual sal_Bool SAL_CALL exporter(const Sequence<PropertyValue>& aSourceData, const Sequence< - OUString>& msUserData) throw (RuntimeException, std::exception) SAL_OVERRIDE; + OUString>& msUserData) throw (RuntimeException, std::exception) override; // XDocumentHandler virtual void SAL_CALL - startDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE; + startDocument() throw (SAXException, RuntimeException, std::exception) override; virtual void SAL_CALL - endDocument() throw (SAXException, RuntimeException, std::exception) SAL_OVERRIDE; + endDocument() throw (SAXException, RuntimeException, std::exception) override; }; XSLTFilter::XSLTFilter(const css::uno::Reference<XComponentContext> &r): |