diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 16:21:18 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-27 08:29:15 +0200 |
commit | 13502c0f201f37960ec06bf1e7e2e8b4d838090a (patch) | |
tree | 036751c32e5aaaf29954cb54fbfa406b841316fd /svx | |
parent | 6844ef8a7ed9b253b6cca4c8d8aec54ef05d013e (diff) |
svx: 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: I1c470ef87e95b22e406099a4e6816693edab2e03
Reviewed-on: https://gerrit.libreoffice.org/58131
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/sdr/contact/displayinfo.cxx | 4 | ||||
-rw-r--r-- | svx/source/styles/ColorSets.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 5 | ||||
-rw-r--r-- | svx/source/xoutdev/XPropertyEntry.cxx | 6 | ||||
-rw-r--r-- | svx/source/xoutdev/xtable.cxx | 6 |
5 files changed, 0 insertions, 24 deletions
diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 6a70a879fb88..e3fc6b91664a 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -34,10 +34,6 @@ namespace sdr { } - DisplayInfo::~DisplayInfo() - { - } - // Access to LayerInfos (which layers to process) void DisplayInfo::SetProcessLayers(const SdrLayerIDSet& rSet) { diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx index ab313c8599f1..7a3fabf6a9d8 100644 --- a/svx/source/styles/ColorSets.cxx +++ b/svx/source/styles/ColorSets.cxx @@ -18,9 +18,6 @@ ColorSet::ColorSet(OUString const & aColorSetName) , maColors(12) {} -ColorSet::~ColorSet() -{} - ColorSets::ColorSets() {} diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 7b490aeecd96..605ed189ae55 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -49,11 +49,6 @@ #include <svx/xpool.hxx> #include <o3tl/make_unique.hxx> - -SdrObjConnection::~SdrObjConnection() -{ -} - void SdrObjConnection::ResetVars() { pObj=nullptr; diff --git a/svx/source/xoutdev/XPropertyEntry.cxx b/svx/source/xoutdev/XPropertyEntry.cxx index 4c29e4f3fb8a..974a5bb20c91 100644 --- a/svx/source/xoutdev/XPropertyEntry.cxx +++ b/svx/source/xoutdev/XPropertyEntry.cxx @@ -25,12 +25,6 @@ XPropertyEntry::XPropertyEntry(const OUString& rPropEntryName) { } -XPropertyEntry::XPropertyEntry(const XPropertyEntry& rOther) -: maPropEntryName(rOther.maPropEntryName), - maUiBitmap(rOther.maUiBitmap) -{ -} - XPropertyEntry::~XPropertyEntry() { } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index aec72447ae82..3b72a44156ba 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -37,12 +37,6 @@ XColorEntry::XColorEntry(const Color& rColor, const OUString& rName) { } -XColorEntry::XColorEntry(const XColorEntry& rOther) -: XPropertyEntry(rOther), -aColor(rOther.aColor) -{ -} - XLineEndEntry::XLineEndEntry(const basegfx::B2DPolyPolygon& rB2DPolyPolygon, const OUString& rName) : XPropertyEntry(rName), aB2DPolyPolygon(rB2DPolyPolygon) |