summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/registry/package
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /desktop/source/deployment/registry/package
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'desktop/source/deployment/registry/package')
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.hxx8
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx46
2 files changed, 27 insertions, 27 deletions
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;
};