summaryrefslogtreecommitdiffstats
path: root/stoc/source/uriproc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /stoc/source/uriproc
parentavoid loading all calendars of a locale (diff)
downloadcore-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz
core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'stoc/source/uriproc')
-rw-r--r--stoc/source/uriproc/ExternalUriReferenceTranslator.cxx2
-rw-r--r--stoc/source/uriproc/UriReferenceFactory.cxx4
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx4
-rw-r--r--stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx4
-rw-r--r--stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index cc08209ecf27..c6ff6bbffa64 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -67,7 +67,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- virtual ~Translator() {}
+ virtual ~Translator() override {}
};
OUString Translator::getImplementationName()
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 88310c5cd340..11f02ca50b3e 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -176,7 +176,7 @@ public:
{ m_base.clearFragment(); }
private:
- virtual ~UriReference() {}
+ virtual ~UriReference() override {}
stoc::uriproc::UriReference m_base;
};
@@ -300,7 +300,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- virtual ~Factory() {}
+ virtual ~Factory() override {}
css::uno::Reference< css::uri::XUriReference > clone(
css::uno::Reference< css::uri::XUriReference > const & uriReference)
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index cd6eef41f788..1bc7bbefcf42 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -136,7 +136,7 @@ public:
throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
private:
- virtual ~UrlReference() {}
+ virtual ~UrlReference() override {}
stoc::uriproc::UriReference base_;
};
@@ -178,7 +178,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- virtual ~Parser() {}
+ virtual ~Parser() override {}
};
OUString Parser::getImplementationName()
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 8405ad7f5c92..c63093d79ce7 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -284,7 +284,7 @@ public:
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override;
private:
- virtual ~UrlReference() {}
+ virtual ~UrlReference() override {}
sal_Int32 findParameter(OUString const & key);
@@ -401,7 +401,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- virtual ~Parser() {}
+ virtual ~Parser() override {}
};
OUString Parser::getImplementationName()
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index c96b081b2982..5d2b25852fa4 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -69,7 +69,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- virtual ~Factory() {}
+ virtual ~Factory() override {}
css::uno::Reference< css::uno::XComponentContext > m_context;
};