diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 13:46:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 08:19:50 +0200 |
commit | 7f0bdd5e88ed49eebe3c0c8edabecffdddeaff4f (patch) | |
tree | b7c5d74e947e9a9d42b92706eb288ecd6bb6b6ac /unotools | |
parent | 322acaa9ad58f4dc9a7025eacedd748dd2c1a1a1 (diff) |
unotools: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined counterparts,
but may prevent implicitly declared copy functions from being defined as non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: Iaa08ef916a2d266e011a2cb66592b377cb1eb23c
Reviewed-on: https://gerrit.libreoffice.org/58095
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/compatibility.cxx | 4 | ||||
-rw-r--r-- | unotools/source/i18n/collatorwrapper.cxx | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index de876fd30fec..b552dc7de5bd 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -67,10 +67,6 @@ SvtCompatibilityEntry::SvtCompatibilityEntry() setDefaultEntry( false ); } -SvtCompatibilityEntry::~SvtCompatibilityEntry() -{ -} - OUString SvtCompatibilityEntry::getName( const Index rIdx ) { static const char* sPropertyName[] = diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx index 0b962264370c..4da1398e0636 100644 --- a/unotools/source/i18n/collatorwrapper.cxx +++ b/unotools/source/i18n/collatorwrapper.cxx @@ -30,10 +30,6 @@ CollatorWrapper::CollatorWrapper ( const uno::Reference< uno::XComponentContext mxInternationalCollator = i18n::Collator::create( rxContext ); } -CollatorWrapper::~CollatorWrapper() -{ -} - sal_Int32 CollatorWrapper::compareString (const OUString& s1, const OUString& s2) const { |