From 7f0bdd5e88ed49eebe3c0c8edabecffdddeaff4f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jul 2018 13:46:27 +0200 Subject: 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 --- include/unotools/collatorwrapper.hxx | 2 -- include/unotools/compatibility.hxx | 1 - include/unotools/configitem.hxx | 5 +++++ include/unotools/confignode.hxx | 4 ---- unotools/source/config/compatibility.cxx | 4 ---- unotools/source/i18n/collatorwrapper.cxx | 4 ---- 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx index 823ba03aada0..77a22d63682a 100644 --- a/include/unotools/collatorwrapper.hxx +++ b/include/unotools/collatorwrapper.hxx @@ -37,8 +37,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper CollatorWrapper ( const css::uno::Reference< css::uno::XComponentContext > &rxContext); - ~CollatorWrapper(); - sal_Int32 compareString ( const OUString& s1, const OUString& s2) const; diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index b48d453fb3fc..cc79b28da922 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -67,7 +67,6 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry }; SvtCompatibilityEntry(); - ~SvtCompatibilityEntry(); static OUString getName( const Index rIdx ); diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 5a842a1193be..302fa0bdde5b 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -165,6 +165,11 @@ namespace utl public: virtual ~ConfigItem() override; + ConfigItem(ConfigItem const &) = default; + ConfigItem(ConfigItem &&) = default; + ConfigItem & operator =(ConfigItem const &) = default; + ConfigItem & operator =(ConfigItem &&) = default; + /** is called from the ConfigManager before application ends of from the PropertyChangeListener if the sub tree broadcasts changes. */ virtual void Notify( const css::uno::Sequence& aPropertyNames)=0; diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 09c9bb266308..5bf4a1473da3 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -221,10 +221,6 @@ namespace utl const bool i_bUpdatable ); - /// copy ctor - OConfigurationTreeRoot(const OConfigurationTreeRoot& _rSource) - :OConfigurationNode(_rSource), m_xCommitter(_rSource.m_xCommitter) { } - /** open a new top-level configuration node opens a new node which is the root if an own configuration sub tree. This is what "top level" means: The 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 { -- cgit