diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 13:47:59 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 08:20:20 +0200 |
commit | f1a10d4f14e86a2a2a632ff4a091690c2f31f255 (patch) | |
tree | 739f86a047016f2ac99c9dca142d666253173c80 /sc/source/ui | |
parent | 7f0bdd5e88ed49eebe3c0c8edabecffdddeaff4f (diff) |
sc: 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: I4efe3eb088e5f9096be87dd8240504768755112b
Reviewed-on: https://gerrit.libreoffice.org/58096
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/dataprovider/dataprovider.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/dbgui/asciiopt.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/asciiopt.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatdlgitem.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 4 |
6 files changed, 5 insertions, 16 deletions
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 01aa0c80331a..f36f80006303 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -66,10 +66,6 @@ ExternalDataSource::ExternalDataSource(const OUString& rURL, { } -ExternalDataSource::~ExternalDataSource() -{ -} - void ExternalDataSource::setID(const OUString& rID) { maID = rID; diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 94bcb4494544..f510577c2712 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -43,10 +43,6 @@ ScAsciiOptions::ScAsciiOptions() : { } -ScAsciiOptions::~ScAsciiOptions() -{ -} - void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) { sal_uInt16 nInfoCount = static_cast< sal_uInt16 >( rDataVec.size() ); diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index c91ac25a5be5..3c73ee25327b 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -47,7 +47,6 @@ private: public: ScAsciiOptions(); - ~ScAsciiOptions(); static const sal_Unicode cDefaultTextSep = '"'; diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx index 0daed60f3f32..55f2e1a5ade2 100644 --- a/sc/source/ui/inc/condformatdlgitem.hxx +++ b/sc/source/ui/inc/condformatdlgitem.hxx @@ -42,6 +42,11 @@ public: virtual ~ScCondFormatDlgItem() override; + ScCondFormatDlgItem(ScCondFormatDlgItem const &) = default; + ScCondFormatDlgItem(ScCondFormatDlgItem &&) = default; + ScCondFormatDlgItem & operator =(ScCondFormatDlgItem const &) = default; + ScCondFormatDlgItem & operator =(ScCondFormatDlgItem &&) = default; + virtual bool operator==(const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index d0d9e84ac16b..0027a73abae2 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -265,9 +265,6 @@ private: anywhere. */ SAL_WARN_UNUSED_RESULT ScSplitPos SanitizeWhichActive() const; - -public: - ~ScViewDataTable(); }; class SC_DLLPUBLIC ScViewData diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index ab9303b23d29..4f0ccf24f0b3 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -493,10 +493,6 @@ ScViewDataTable::ScViewDataTable() : nPixPosY[0]=nPixPosY[1]=0; } -ScViewDataTable::~ScViewDataTable() -{ -} - void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings, const ScViewData& rViewData) const { rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT); |