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 --- include/svx/grfcrop.hxx | 12 +++++------- include/svx/postattr.hxx | 24 ------------------------ 2 files changed, 5 insertions(+), 31 deletions(-) (limited to 'include/svx') diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 96fc7d5c802f..73693e65123d 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -36,6 +36,11 @@ public: sal_uInt16 ); virtual ~SvxGrfCrop() override; + SvxGrfCrop(SvxGrfCrop const &) = default; + SvxGrfCrop(SvxGrfCrop &&) = default; + SvxGrfCrop & operator =(SvxGrfCrop const &) = default; + SvxGrfCrop & operator =(SvxGrfCrop &&) = default; + // "pure virtual methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -57,13 +62,6 @@ public: sal_Int32 GetRight() const { return nRight; } sal_Int32 GetTop() const { return nTop; } sal_Int32 GetBottom() const { return nBottom; } - - SvxGrfCrop& operator=( const SvxGrfCrop& rCrop ) - { - nLeft = rCrop.GetLeft(); nTop = rCrop.GetTop(); - nRight = rCrop.GetRight(); nBottom = rCrop.GetBottom(); - return *this; - } }; #endif // INCLUDED_SVX_GRFCROP_HXX diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 65dee15106d5..1e5da716376e 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -40,12 +40,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - - SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) - { - SetValue( rAuthor.GetValue() ); - return *this; - } }; @@ -66,12 +60,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - - SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) - { - SetValue( rDate.GetValue() ); - return *this; - } }; /** The text of a note @@ -92,12 +80,6 @@ public: OUString &rText, const IntlWrapper& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - - SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) - { - SetValue( rText.GetValue() ); - return *this; - } }; @@ -112,12 +94,6 @@ public: SvxPostItIdItem( sal_uInt16 nWhich ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; - - SvxPostItIdItem& operator=( const SvxPostItIdItem& rId ) - { - SetValue( rId.GetValue() ); - return *this; - } }; #endif -- cgit v1.2.3