diff options
Diffstat (limited to 'desktop/source/deployment/registry')
16 files changed, 141 insertions, 141 deletions
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index ec2aff2c33b7..2fa6172e428f 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -65,10 +65,10 @@ namespace component { class ComponentBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; - virtual OUString getNSPrefix() SAL_OVERRIDE; - virtual OUString getRootElementName() SAL_OVERRIDE; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; + virtual OUString getNSPrefix() override; + virtual OUString getRootElementName() override; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index f595e9f0170e..35b0205e5394 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -128,19 +128,19 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void componentLiveRemoval(ComponentBackendDb::Data const & data); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; const Reference<registry::XSimpleRegistry> getRDB() const; @@ -162,13 +162,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: ComponentsPackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -184,19 +184,19 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend const bool m_jarFile; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: TypelibraryPackageImpl( @@ -231,13 +231,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; private: OUString const m_aPlatform; @@ -274,9 +274,9 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; const Reference<deployment::XPackageTypeInfo> m_xDynComponentTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xJavaComponentTypeInfo; @@ -324,11 +324,11 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using PackageRegistryBackend::disposing; diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 128484a1bd04..31cca388ff30 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -75,13 +75,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: inline PackageImpl( @@ -110,14 +110,14 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; #if HAVE_FEATURE_EXTENSIONS // for backwards compatibility - nil if no (compatible) back-compat db present ::std::unique_ptr<PersistentMap> m_registeredPackages; #endif - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; const Reference<deployment::XPackageTypeInfo> m_xConfDataTypeInfo; const Reference<deployment::XPackageTypeInfo> m_xConfSchemaTypeInfo; @@ -148,10 +148,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using PackageRegistryBackend::disposing; }; diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index b1de325ed5ca..e38b3885dc15 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -42,13 +42,13 @@ namespace configuration { class ConfigurationBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 7c8b9282c6cc..3eb0c06c0a5a 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -92,7 +92,7 @@ class PackageRegistryImpl : private MutexHolder, public t_helper protected: inline void check(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual ~PackageRegistryImpl(); PackageRegistryImpl() : t_helper( getMutex() ) {} @@ -105,7 +105,7 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL update() throw (RuntimeException, std::exception) override; // XPackageRegistry virtual Reference<deployment::XPackage> SAL_CALL bindPackage( @@ -114,12 +114,12 @@ public: throw (deployment::DeploymentException, deployment::InvalidRemovedParameterException, CommandFailedException, - lang::IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::IllegalArgumentException, RuntimeException, std::exception) override; virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 9be5d9c53bfc..18d1e7786c5e 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -50,13 +50,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<dp_misc::AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<dp_misc::AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; bool getFileAttributes(sal_uInt64& out_Attributes); bool isUrlTargetInExtension(); @@ -79,7 +79,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, - OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv ) override; void addDataToDb(OUString const & url); bool hasActiveEntry(OUString const & url); @@ -93,10 +93,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using PackageRegistryBackend::disposing; }; diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index dcf3135a437f..da5ff6cf7099 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -42,13 +42,13 @@ namespace executable { class ExecutableBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 67ca90f68a46..f6e5a4b3e06c 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -64,13 +64,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: @@ -85,7 +85,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend //XPackage virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (deployment::DeploymentException, deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; }; friend class PackageImpl; @@ -93,7 +93,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; void implProcessHelp( PackageImpl * package, bool doRegisterPackage, Reference<ucb::XCommandEnvironment> const & xCmdEnv); @@ -119,10 +119,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 031cccb42786..191e1a54d293 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -41,13 +41,13 @@ namespace help { class HelpBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 67b0ddfb29f5..d5c29eade70d 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -69,7 +69,7 @@ protected: void check() const; void fireModified(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; void checkAborted( ::rtl::Reference< ::dp_misc::AbortChannel > const & abortChannel ); @@ -120,40 +120,40 @@ public: {} // XPackageTypeInfo virtual OUString SAL_CALL getMediaType() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getShortDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getFileFilter() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast, sal_Bool smallIcon ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() 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 & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeModifyListener( css::uno::Reference<css::util::XModifyListener> const & xListener ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPackage virtual css::uno::Reference<css::task::XAbortChannel> SAL_CALL - createAbortChannel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + createAbortChannel() throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Optional< css::beans::Ambiguous<sal_Bool> > SAL_CALL isRegistered( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -161,7 +161,7 @@ public: throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL checkPrerequisites( const css::uno::Reference< css::task::XAbortChannel >& xAbortChannel, @@ -171,14 +171,14 @@ public: css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual ::sal_Bool SAL_CALL checkDependencies( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv ) throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL registerPackage( sal_Bool startup, @@ -188,7 +188,7 @@ public: css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL revokePackage( sal_Bool startup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -197,9 +197,9 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBundle() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getBundle( css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, @@ -208,39 +208,39 @@ public: css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, - 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 css::beans::Optional< OUString > SAL_CALL getIdentifier() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getVersion() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getURL() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDisplayName() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getLicenseText() throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getUpdateInformationURLs() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::beans::StringPair SAL_CALL getPublisherInfo() throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getIcon( sal_Bool bHighContrast ) throw (css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL - getPackageType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getPackageType() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, @@ -248,15 +248,15 @@ public: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, - css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::ucb::ContentCreationException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRepositoryName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (css::deployment::DeploymentException, css::deployment::ExtensionRemovedException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isRemoved() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; @@ -306,7 +306,7 @@ protected: = 0; void check(); - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; virtual ~PackageRegistryBackend(); PackageRegistryBackend( @@ -350,7 +350,7 @@ public: // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XPackageRegistry virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage( @@ -360,7 +360,7 @@ public: throw (css::deployment::DeploymentException, css::deployment::InvalidRemovedParameterException, css::ucb::CommandFailedException, - css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // virtual void SAL_CALL packageRemoved( // OUString const & url, OUString const & mediaType) diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index 4d0060eadc61..a5f06976855c 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -43,10 +43,10 @@ namespace bundle { class ExtensionBackendDb: public dp_registry::backend::BackendDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; - virtual OUString getNSPrefix() SAL_OVERRIDE; - virtual OUString getRootElementName() SAL_OVERRIDE; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; + virtual OUString getNSPrefix() override; + virtual OUString getRootElementName() override; + virtual OUString getKeyElementName() override; public: struct Data diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 4f974ec102aa..6a9dc3fa317c 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -147,15 +147,15 @@ class BackendImpl : public ImplBaseT virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; @@ -170,7 +170,7 @@ class BackendImpl : public ImplBaseT OUString const & identifier); // XPackage - virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isBundle() throw (RuntimeException, std::exception) override; virtual Sequence< Reference<deployment::XPackage> > SAL_CALL getBundle( Reference<task::XAbortChannel> const & xAbortChannel, @@ -178,14 +178,14 @@ class BackendImpl : public ImplBaseT throw (deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - lang::IllegalArgumentException, RuntimeException, std::exception) SAL_OVERRIDE; + lang::IllegalArgumentException, RuntimeException, std::exception) override; virtual OUString SAL_CALL getDescription() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual OUString SAL_CALL getLicenseText() throw (deployment::DeploymentException, deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual void SAL_CALL exportTo( OUString const & destFolderURL, OUString const & newTitle, @@ -195,7 +195,7 @@ class BackendImpl : public ImplBaseT ucb::CommandFailedException, ucb::CommandAbortedException, ucb::ContentCreationException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL checkPrerequisites( const Reference< task::XAbortChannel >& xAbortChannel, @@ -205,34 +205,34 @@ class BackendImpl : public ImplBaseT deployment::DeploymentException, ucb::CommandFailedException, ucb::CommandAbortedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL checkDependencies( const Reference< ucb::XCommandEnvironment >& xCmdEnv ) throw (deployment::DeploymentException, deployment::ExtensionRemovedException, ucb::CommandFailedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual beans::Optional<OUString> SAL_CALL getIdentifier() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual OUString SAL_CALL getVersion() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual Sequence<OUString> SAL_CALL getUpdateInformationURLs() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual beans::StringPair SAL_CALL getPublisherInfo() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual OUString SAL_CALL getDisplayName() - throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) SAL_OVERRIDE; + throw (deployment::ExtensionRemovedException, RuntimeException, std::exception) override; virtual Reference< graphic::XGraphic > SAL_CALL getIcon( sal_Bool bHighContrast ) throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; }; friend class PackageImpl; @@ -251,9 +251,9 @@ class BackendImpl : public ImplBaseT virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<ucb::XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) override; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: BackendImpl( @@ -262,18 +262,18 @@ public: Reference<deployment::XPackageRegistry> const & xRootRegistry ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) SAL_OVERRIDE; + throw (RuntimeException, std::exception) override; // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; using ImplBaseT::disposing; }; diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 635865677115..a02ee3f6688c 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -62,13 +62,13 @@ class BackendImpl : public t_helper virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: PackageImpl( @@ -84,7 +84,7 @@ class BackendImpl : public t_helper virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; void addDataToDb(OUString const & url); bool hasActiveEntry(OUString const & url); @@ -99,14 +99,14 @@ public: Reference<XComponentContext> const & xComponentContext ); // XUpdatable - virtual void SAL_CALL update() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL update() throw (RuntimeException, std::exception) override; // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; }; diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index d4f1c2753410..c1a6024f4d86 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -40,13 +40,13 @@ namespace script { class ScriptBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual OUString getDbNSName() SAL_OVERRIDE; + virtual OUString getDbNSName() override; - virtual OUString getNSPrefix() SAL_OVERRIDE; + virtual OUString getNSPrefix() override; - virtual OUString getRootElementName() SAL_OVERRIDE; + virtual OUString getRootElementName() override; - virtual OUString getKeyElementName() SAL_OVERRIDE; + virtual OUString getKeyElementName() override; public: diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 11051e6fb532..0c7459d42d0b 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -49,32 +49,32 @@ public: bool isParsed() { return m_bIsParsed; } // XDocumentHandler 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; + 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; }; } } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 6e5d99629c6f..98d044d6ecf8 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -61,13 +61,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; virtual void processPackage_( ::osl::ResettableMutexGuard & guard, bool registerPackage, bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; public: PackageImpl( @@ -77,10 +77,10 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend // XPackage virtual OUString SAL_CALL getDescription() throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual OUString SAL_CALL getLicenseText() throw (deployment::ExtensionRemovedException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; }; friend class PackageImpl; @@ -88,7 +88,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, bool bRemoved, OUString const & identifier, - Reference<XCommandEnvironment> const & xCmdEnv ) SAL_OVERRIDE; + Reference<XCommandEnvironment> const & xCmdEnv ) override; const Reference<deployment::XPackageTypeInfo> m_xTypeInfo; @@ -100,10 +100,10 @@ public: // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL - getSupportedPackageTypes() throw (RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedPackageTypes() throw (RuntimeException, std::exception) override; virtual void SAL_CALL packageRemoved(OUString const & url, OUString const & mediaType) throw (deployment::DeploymentException, - uno::RuntimeException, std::exception) SAL_OVERRIDE; + uno::RuntimeException, std::exception) override; }; BackendImpl * BackendImpl::PackageImpl::getMyBackend() const |