From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- configmgr/qa/unit/test.cxx | 16 ++--- configmgr/source/access.hxx | 104 ++++++++++++++--------------- configmgr/source/childaccess.hxx | 32 ++++----- configmgr/source/components.cxx | 2 +- configmgr/source/configurationprovider.cxx | 40 +++++------ configmgr/source/configurationregistry.cxx | 86 ++++++++++++------------ configmgr/source/groupnode.hxx | 12 ++-- configmgr/source/localizedpropertynode.hxx | 6 +- configmgr/source/localizedvaluenode.hxx | 6 +- configmgr/source/propertynode.hxx | 4 +- configmgr/source/readonlyaccess.cxx | 12 ++-- configmgr/source/readwriteaccess.cxx | 24 +++---- configmgr/source/rootaccess.hxx | 44 ++++++------ configmgr/source/rootnode.hxx | 6 +- configmgr/source/setnode.hxx | 12 ++-- configmgr/source/update.cxx | 8 +-- configmgr/source/xcdparser.hxx | 8 +-- configmgr/source/xcsparser.hxx | 8 +-- configmgr/source/xcuparser.hxx | 8 +-- 19 files changed, 219 insertions(+), 219 deletions(-) (limited to 'configmgr') diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index 6985cab57fde..89dac95c113f 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -65,8 +65,8 @@ namespace { class Test: public CppUnit::TestFixture { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testKeyFetch(); void testKeySet(); @@ -133,11 +133,11 @@ protected: private: virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL propertyChange( css::beans::PropertyChangeEvent const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; int count_; bool * destroyed_; @@ -191,7 +191,7 @@ public: SimpleRecursiveTest(Test const & theTest, int count, bool * destroyed); private: - virtual void step() const SAL_OVERRIDE; + virtual void step() const override; }; SimpleRecursiveTest::SimpleRecursiveTest( @@ -500,7 +500,7 @@ protected: virtual bool iteration() = 0; private: - virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL run() override; osl::Condition & stop_; bool success_; @@ -536,7 +536,7 @@ public: OUString const & relative); private: - virtual bool iteration() SAL_OVERRIDE; + virtual bool iteration() override; Test const & test_; OUString path_; @@ -580,7 +580,7 @@ public: OUString const & relative); private: - virtual bool iteration() SAL_OVERRIDE; + virtual bool iteration() override; Test const & test_; OUString path_; diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index f9006657a17d..5a71adb6f569 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -135,60 +135,60 @@ public: using OWeakObject::release; virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getImplementationId() throw (css::uno::RuntimeException, std::exception) override; 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(OUString const & 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; + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addEventListener( css::uno::Reference< css::lang::XEventListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( css::uno::Reference< css::lang::XEventListener > const & aListener) - 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; virtual css::uno::Any SAL_CALL getByName( OUString const & aName) 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; + getElementNames() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( OUString const & aName) throw ( css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL replaceByHierarchicalName( OUString const & aName, css::uno::Any const & aElement) @@ -196,56 +196,56 @@ public: css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getExactName( OUString const & aApproximateName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::beans::Property > - SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Property SAL_CALL getPropertyByName( OUString const & aName) throw ( css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getHierarchicalName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL composeHierarchicalName( OUString const & aRelativeName) throw ( css::lang::IllegalArgumentException, css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Property SAL_CALL getAsProperty() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( OUString const & aPropertyName, @@ -255,14 +255,14 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const & aPropertyName, @@ -271,7 +271,7 @@ public: throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( OUString const & aPropertyName, @@ -280,7 +280,7 @@ public: throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( OUString const & PropertyName, @@ -289,7 +289,7 @@ public: throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( OUString const & PropertyName, @@ -298,7 +298,7 @@ public: throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames, @@ -308,38 +308,38 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertiesChangeListener( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertiesChangeListener( css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL firePropertiesChangeEvent( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::beans::XHierarchicalPropertySetInfo > SAL_CALL getHierarchicalPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName, @@ -349,7 +349,7 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName) @@ -357,7 +357,7 @@ public: css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setHierarchicalPropertyValues( css::uno::Sequence< OUString > const & @@ -368,7 +368,7 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHierarchicalPropertyValues( @@ -377,17 +377,17 @@ public: throw ( css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::beans::Property SAL_CALL getPropertyByHierarchicalName(OUString const & aHierarchicalName) throw ( css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL replaceByName( OUString const & aName, css::uno::Any const & aElement) @@ -395,7 +395,7 @@ public: css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertByName( OUString const & aName, css::uno::Any const & aElement) @@ -403,19 +403,19 @@ public: 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(OUString const & aName) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() 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( @@ -423,7 +423,7 @@ public: aArguments) throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; protected: explicit Access(Components & components); @@ -445,7 +445,7 @@ protected: virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; Components & getComponents() const { return components_;} diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx index 6f0750a3fc10..703b28a21f0b 100644 --- a/configmgr/source/childaccess.hxx +++ b/configmgr/source/childaccess.hxx @@ -66,35 +66,35 @@ public: Components & components, rtl::Reference< RootAccess > const & root, rtl::Reference< Node > const & node); - virtual Path getAbsolutePath() SAL_OVERRIDE; - virtual Path getRelativePath() SAL_OVERRIDE; + virtual Path getAbsolutePath() override; + virtual Path getRelativePath() override; - virtual OUString getRelativePathRepresentation() SAL_OVERRIDE; - virtual rtl::Reference< Node > getNode() SAL_OVERRIDE; + virtual OUString getRelativePathRepresentation() override; + virtual rtl::Reference< Node > getNode() override; - virtual bool isFinalized() SAL_OVERRIDE; + virtual bool isFinalized() override; - virtual OUString getNameInternal() SAL_OVERRIDE; + virtual OUString getNameInternal() override; - virtual rtl::Reference< RootAccess > getRootAccess() SAL_OVERRIDE; - virtual rtl::Reference< Access > getParentAccess() SAL_OVERRIDE; + virtual rtl::Reference< RootAccess > getRootAccess() override; + virtual rtl::Reference< Access > getParentAccess() override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; + virtual void SAL_CALL release() throw () override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( css::uno::Reference< css::uno::XInterface > const &) throw ( css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Int64 SAL_CALL getSomething( css::uno::Sequence< sal_Int8 > const & aIdentifier) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; void bind( rtl::Reference< RootAccess > const & root, @@ -122,14 +122,14 @@ private: virtual ~ChildAccess(); virtual void addTypes( - std::vector< css::uno::Type > * types) const SAL_OVERRIDE; + std::vector< css::uno::Type > * types) const override; virtual void addSupportedServiceNames( - std::vector< OUString > * services) SAL_OVERRIDE; + std::vector< OUString > * services) override; virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; rtl::Reference< RootAccess > root_; rtl::Reference< Access > parent_; // null if free node diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index ca0894015935..90349886b4d4 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -156,7 +156,7 @@ public: private: virtual ~WriteThread() {} - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; rtl::Reference< WriteThread > * reference_; Components & components_; diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 58c3da6e73b8..0c4b40868772 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -115,10 +115,10 @@ private: virtual ~Service() {} - virtual void SAL_CALL disposing() SAL_OVERRIDE { flushModifications(); } + virtual void SAL_CALL disposing() override { flushModifications(); } virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return default_ ? default_provider::getImplementationName() @@ -126,11 +126,11 @@ private: } virtual 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); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return default_ ? default_provider::getSupportedServiceNames() @@ -139,42 +139,42 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLocale(css::lang::Locale const & 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; void flushModifications() const; @@ -384,24 +384,24 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return configuration_provider::getImplementationName(); } virtual 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); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return configuration_provider::getSupportedServiceNames(); } }; diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index 6fa5450ca5c3..4fadaf6a1f8b 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -81,59 +81,59 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return configuration_registry::getImplementationName(); } virtual 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); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return configuration_registry::getSupportedServiceNames(); } - virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL open( OUString const & rURL, sal_Bool bReadOnly, sal_Bool) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL close() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL destroy() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL getRootKey() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL mergeKey(OUString const &, OUString const &) throw ( css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; void checkValid(); @@ -164,154 +164,154 @@ private: virtual ~RegistryKey() {} virtual OUString SAL_CALL getKeyName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isReadOnly() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; virtual css::registry::RegistryKeyType SAL_CALL getKeyType( OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::registry::RegistryValueType SAL_CALL getValueType() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getLongValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLongValue(sal_Int32) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLongListValue( css::uno::Sequence< sal_Int32 > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getAsciiValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAsciiValue(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAsciiListValue( css::uno::Sequence< OUString > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getStringValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStringValue(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStringListValue( css::uno::Sequence< OUString > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey( OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL createKey(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeKey() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deleteKey(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > SAL_CALL openKeys() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL createLink( OUString const &, OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deleteLink(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLinkTarget(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getResolvedName( OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; Service & service_; css::uno::Any value_; diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx index 77067c4090ae..59f2d7e3feeb 100644 --- a/configmgr/source/groupnode.hxx +++ b/configmgr/source/groupnode.hxx @@ -34,15 +34,15 @@ class GroupNode: public Node { public: GroupNode(int layer, bool extensible, OUString const & templateName); - virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; + virtual rtl::Reference< Node > clone(bool keepTemplateName) const override; - virtual NodeMap & getMembers() SAL_OVERRIDE; + virtual NodeMap & getMembers() override; - virtual OUString getTemplateName() const SAL_OVERRIDE; + virtual OUString getTemplateName() const override; - virtual void setMandatory(int layer) SAL_OVERRIDE; + virtual void setMandatory(int layer) override; - virtual int getMandatory() const SAL_OVERRIDE; + virtual int getMandatory() const override; bool isExtensible() const { return extensible_;} @@ -51,7 +51,7 @@ private: virtual ~GroupNode(); - virtual Kind kind() const SAL_OVERRIDE; + virtual Kind kind() const override; bool extensible_; NodeMap members_; diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx index 1fe322fc60e9..702613f8abe8 100644 --- a/configmgr/source/localizedpropertynode.hxx +++ b/configmgr/source/localizedpropertynode.hxx @@ -35,9 +35,9 @@ class LocalizedPropertyNode: public Node { public: LocalizedPropertyNode(int layer, Type staticType, bool nillable); - virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; + virtual rtl::Reference< Node > clone(bool keepTemplateName) const override; - virtual NodeMap & getMembers() SAL_OVERRIDE; + virtual NodeMap & getMembers() override; Type getStaticType() const { return staticType_;} @@ -48,7 +48,7 @@ private: virtual ~LocalizedPropertyNode(); - virtual Kind kind() const SAL_OVERRIDE; + virtual Kind kind() const override; Type staticType_; // as specified in the component-schema (TYPE_ANY, ..., diff --git a/configmgr/source/localizedvaluenode.hxx b/configmgr/source/localizedvaluenode.hxx index f2aa68a084f9..f4300e977b04 100644 --- a/configmgr/source/localizedvaluenode.hxx +++ b/configmgr/source/localizedvaluenode.hxx @@ -35,9 +35,9 @@ public: explicit LocalizedValueNode(int layer); LocalizedValueNode(int layer, css::uno::Any const & value); - virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; + virtual rtl::Reference< Node > clone(bool keepTemplateName) const override; - virtual OUString getTemplateName() const SAL_OVERRIDE; + virtual OUString getTemplateName() const override; css::uno::Any getValue() const { return value_;} css::uno::Any *getValuePtr(int layer) @@ -53,7 +53,7 @@ private: virtual ~LocalizedValueNode(); - virtual Kind kind() const SAL_OVERRIDE; + virtual Kind kind() const override; css::uno::Any value_; }; diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx index 273fc5235eef..7716ae963e34 100644 --- a/configmgr/source/propertynode.hxx +++ b/configmgr/source/propertynode.hxx @@ -39,7 +39,7 @@ public: int layer, Type staticType, bool nillable, css::uno::Any const & value, bool extension); - virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; + virtual rtl::Reference< Node > clone(bool keepTemplateName) const override; Type getStaticType() const { return staticType_;} @@ -59,7 +59,7 @@ private: virtual ~PropertyNode(); - virtual Kind kind() const SAL_OVERRIDE; + virtual Kind kind() const override; Type staticType_; // as specified in the component-schema (TYPE_ANY, ..., diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx index 8948ce93043e..b1c331bdb878 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -57,29 +57,29 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return read_only_access::getImplementationName(); } virtual 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); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return read_only_access::getSupportedServiceNames(); } virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( OUString const & aName) throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override { return getRoot()->getByHierarchicalName(aName); } virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getRoot()->hasByHierarchicalName(aName); } rtl::Reference< RootAccess > getRoot(); diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx index d1cc4134562e..1a3b0d4503cb 100644 --- a/configmgr/source/readwriteaccess.cxx +++ b/configmgr/source/readwriteaccess.cxx @@ -59,29 +59,29 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return read_write_access::getImplementationName(); } virtual 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); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return read_write_access::getSupportedServiceNames(); } virtual void SAL_CALL initialize( css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( OUString const & aName) throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override { return getRoot()->getByHierarchicalName(aName); } virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getRoot()->hasByHierarchicalName(aName); } virtual void SAL_CALL replaceByHierarchicalName( @@ -89,19 +89,19 @@ private: throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { getRoot()->replaceByHierarchicalName(aName, aElement); } virtual void SAL_CALL commitChanges() - throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override { getRoot()->commitChanges(); } virtual sal_Bool SAL_CALL hasPendingChanges() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getRoot()->hasPendingChanges(); } virtual css::util::ChangesSet SAL_CALL getPendingChanges() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getRoot()->getPendingChanges(); } css::beans::Property SAL_CALL getPropertyByHierarchicalName( @@ -109,12 +109,12 @@ private: throw ( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) - SAL_OVERRIDE + override { return getRoot()->getPropertyByHierarchicalName(aHierarchicalName); } sal_Bool SAL_CALL hasPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getRoot()->hasPropertyByHierarchicalName(aHierarchicalName); } rtl::Reference< RootAccess > getRoot(); diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index e775dda4512d..abde6fc2771d 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -62,14 +62,14 @@ public: Components & components, OUString const & pathRepresenation, OUString const & locale, bool update); - virtual Path getAbsolutePath() SAL_OVERRIDE; + virtual Path getAbsolutePath() override; virtual void initBroadcaster( - Modifications::Node const & modifications, Broadcaster * broadcaster) SAL_OVERRIDE; + Modifications::Node const & modifications, Broadcaster * broadcaster) override; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () override; OUString getAbsolutePathRepresentation(); @@ -82,58 +82,58 @@ public: virtual void SAL_CALL addChangesListener( css::uno::Reference< css::util::XChangesListener > const & aListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeChangesListener( css::uno::Reference< css::util::XChangesListener > const & aListener) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commitChanges() throw ( css::lang::WrappedTargetException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual sal_Bool SAL_CALL hasPendingChanges() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::util::ChangesSet SAL_CALL getPendingChanges() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: virtual ~RootAccess(); - virtual Path getRelativePath() SAL_OVERRIDE; + virtual Path getRelativePath() override; - virtual OUString getRelativePathRepresentation() SAL_OVERRIDE; + virtual OUString getRelativePathRepresentation() override; - virtual rtl::Reference< Node > getNode() SAL_OVERRIDE; + virtual rtl::Reference< Node > getNode() override; - virtual bool isFinalized() SAL_OVERRIDE; + virtual bool isFinalized() override; - virtual OUString getNameInternal() SAL_OVERRIDE; + virtual OUString getNameInternal() override; - virtual rtl::Reference< RootAccess > getRootAccess() SAL_OVERRIDE; + virtual rtl::Reference< RootAccess > getRootAccess() override; - virtual rtl::Reference< Access > getParentAccess() SAL_OVERRIDE; + virtual rtl::Reference< Access > getParentAccess() override; virtual void addTypes(std::vector< css::uno::Type > * types) - const SAL_OVERRIDE; + const override; virtual void addSupportedServiceNames( - std::vector< OUString > * services) SAL_OVERRIDE; + std::vector< OUString > * services) override; - virtual void initDisposeBroadcaster(Broadcaster * broadcaster) SAL_OVERRIDE; + virtual void initDisposeBroadcaster(Broadcaster * broadcaster) override; - virtual void clearListeners() throw () SAL_OVERRIDE; + virtual void clearListeners() throw () override; virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; typedef std::multiset< diff --git a/configmgr/source/rootnode.hxx b/configmgr/source/rootnode.hxx index 0b111925c523..28e1041f1ff7 100644 --- a/configmgr/source/rootnode.hxx +++ b/configmgr/source/rootnode.hxx @@ -26,11 +26,11 @@ public: private: virtual ~RootNode(); - virtual Kind kind() const SAL_OVERRIDE; + virtual Kind kind() const override; - virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; + virtual rtl::Reference< Node > clone(bool keepTemplateName) const override; - virtual NodeMap & getMembers() SAL_OVERRIDE; + virtual NodeMap & getMembers() override; NodeMap members_; }; diff --git a/configmgr/source/setnode.hxx b/configmgr/source/setnode.hxx index 59109d78acb0..e0ce35f67a7d 100644 --- a/configmgr/source/setnode.hxx +++ b/configmgr/source/setnode.hxx @@ -38,15 +38,15 @@ public: int layer, OUString const & defaultTemplateName, OUString const & templateName); - virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; + virtual rtl::Reference< Node > clone(bool keepTemplateName) const override; - virtual NodeMap & getMembers() SAL_OVERRIDE; + virtual NodeMap & getMembers() override; - virtual OUString getTemplateName() const SAL_OVERRIDE; + virtual OUString getTemplateName() const override; - virtual void setMandatory(int layer) SAL_OVERRIDE; + virtual void setMandatory(int layer) override; - virtual int getMandatory() const SAL_OVERRIDE; + virtual int getMandatory() const override; OUString const & getDefaultTemplateName() const { return defaultTemplateName_;} @@ -59,7 +59,7 @@ private: virtual ~SetNode(); - virtual Kind kind() const SAL_OVERRIDE; + virtual Kind kind() const override; OUString defaultTemplateName_; std::vector< OUString > additionalTemplateNames_; diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index 44b9840b612e..058235ed6aba 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -75,22 +75,22 @@ private: virtual void SAL_CALL insertExtensionXcsFile( sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL insertExtensionXcuFile( sal_Bool shared, OUString const & fileUri) throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri) throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; virtual void SAL_CALL insertModificationXcuFile( OUString const & fileUri, css::uno::Sequence< OUString > const & includedPaths, css::uno::Sequence< OUString > const & excludedPaths) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; std::shared_ptr lock_; css::uno::Reference< css::uno::XComponentContext > context_; diff --git a/configmgr/source/xcdparser.hxx b/configmgr/source/xcdparser.hxx index f5313af60012..c537f5b86398 100644 --- a/configmgr/source/xcdparser.hxx +++ b/configmgr/source/xcdparser.hxx @@ -45,15 +45,15 @@ public: private: virtual ~XcdParser(); - virtual xmlreader::XmlReader::Text getTextMode() SAL_OVERRIDE; + virtual xmlreader::XmlReader::Text getTextMode() override; virtual bool startElement( xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name, - std::set< OUString > const * existingDependencies) SAL_OVERRIDE; + std::set< OUString > const * existingDependencies) override; - virtual void endElement(xmlreader::XmlReader const & reader) SAL_OVERRIDE; + virtual void endElement(xmlreader::XmlReader const & reader) override; - virtual void characters(xmlreader::Span const & text) SAL_OVERRIDE; + virtual void characters(xmlreader::Span const & text) override; enum State { STATE_START, STATE_DEPENDENCIES, STATE_DEPENDENCY, STATE_COMPONENTS }; diff --git a/configmgr/source/xcsparser.hxx b/configmgr/source/xcsparser.hxx index b83ffd1a5a0f..7a01c5d5d426 100644 --- a/configmgr/source/xcsparser.hxx +++ b/configmgr/source/xcsparser.hxx @@ -47,15 +47,15 @@ public: private: virtual ~XcsParser(); - virtual xmlreader::XmlReader::Text getTextMode() SAL_OVERRIDE; + virtual xmlreader::XmlReader::Text getTextMode() override; virtual bool startElement( xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name, - std::set< OUString > const * existingDependencies) SAL_OVERRIDE; + std::set< OUString > const * existingDependencies) override; - virtual void endElement(xmlreader::XmlReader const & reader) SAL_OVERRIDE; + virtual void endElement(xmlreader::XmlReader const & reader) override; - virtual void characters(xmlreader::Span const & text) SAL_OVERRIDE; + virtual void characters(xmlreader::Span const & text) override; void handleComponentSchema(xmlreader::XmlReader & reader); diff --git a/configmgr/source/xcuparser.hxx b/configmgr/source/xcuparser.hxx index 4526478c0804..9628db292790 100644 --- a/configmgr/source/xcuparser.hxx +++ b/configmgr/source/xcuparser.hxx @@ -59,15 +59,15 @@ public: private: virtual ~XcuParser(); - virtual xmlreader::XmlReader::Text getTextMode() SAL_OVERRIDE; + virtual xmlreader::XmlReader::Text getTextMode() override; virtual bool startElement( xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name, - std::set< OUString > const * existingDependencies) SAL_OVERRIDE; + std::set< OUString > const * existingDependencies) override; - virtual void endElement(xmlreader::XmlReader const & reader) SAL_OVERRIDE; + virtual void endElement(xmlreader::XmlReader const & reader) override; - virtual void characters(xmlreader::Span const & span) SAL_OVERRIDE; + virtual void characters(xmlreader::Span const & span) override; enum Operation { OPERATION_MODIFY, OPERATION_REPLACE, OPERATION_FUSE, OPERATION_REMOVE }; -- cgit