From 727878a7d8ae25342db75173cc314fa330ccc077 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jul 2018 16:42:16 +0200 Subject: Remove unused copy assignment ops of SfxPoolItem-derived classes SfxPoolItem has the curious design of non-deleted copy ctor and deleted copy assignment op. Many derived classes then provide a non-deleted assignment op, apparently more or less on an as-needed basis. But some of those user-provided assignment ops are actually unused (and their presence causes -Werror=deprecated-copy with GCC trunk towards GCC 9 when the---implicitly- defined---copy ctor of the derived class is used), so remove them. In some cases that would still cause -Werror=deprected-copy because of a user-declared dtor, so in those cases explicitly default all the copy/move functions (some of which will then be implicitly defined as deleted). Change-Id: If0d9f1a9f3954263a39ffd27ba895d6202afa307 Reviewed-on: https://gerrit.libreoffice.org/58133 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- editeng/source/items/justifyitem.cxx | 6 ------ editeng/source/items/writingmodeitem.cxx | 6 ------ 2 files changed, 12 deletions(-) (limited to 'editeng') diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index f940950bede4..c22b989bfc0e 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -393,10 +393,4 @@ sal_uInt16 SvxJustifyMethodItem::GetValueCount() const return static_cast(SvxCellJustifyMethod::Distribute) + 1; // Last Enum value + 1 } -SvxJustifyMethodItem& SvxJustifyMethodItem::operator=(const SvxJustifyMethodItem& r) -{ - SetValue( r.GetValue() ); - return *this; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index d4cd8a385d3b..25e6bfb1cb22 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -105,10 +105,4 @@ bool SvxWritingModeItem::QueryValue( css::uno::Any& rVal, return true; } -SvxWritingModeItem& SvxWritingModeItem::operator=( const SvxWritingModeItem& rItem ) -{ - SetValue( static_cast(rItem.GetValue()) ); - return *this; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit