[Libreoffice-commits] core.git: sw/inc sw/source
Stephan Bergmann
sbergman at redhat.com
Wed Jul 4 12:44:10 UTC 2018
sw/inc/calbck.hxx | 2 ++
sw/source/core/layout/pagedesc.cxx | 1 +
sw/source/core/txtnode/atrref.cxx | 1 +
3 files changed, 4 insertions(+)
New commits:
commit 4997f500497421f52adf3d4cd05df86f7c780c22
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jul 3 16:39:50 2018 +0200
-Werror=deprecated-copy (GCC trunk towards GCC 9)
(BroadcasterMixin apparently needs a one-off user-provided copy assignment op
due to SvtBroadcaster's odd design of having a user-provided copy ctor and an
explicitly deleted copy assignment op.)
Change-Id: I8fcb5a40f82031f94c37a65e9bd54657dfd07b7e
Reviewed-on: https://gerrit.libreoffice.org/56876
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 25e815177f0a..4abc91d6c214 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -83,6 +83,8 @@ namespace sw
class SW_DLLPUBLIC BroadcasterMixin {
SvtBroadcaster m_aNotifier;
public:
+ BroadcasterMixin() = default;
+ BroadcasterMixin(BroadcasterMixin const &) = default;
BroadcasterMixin& operator=(const BroadcasterMixin&)
{
return *this; // Listeners are never copied or moved.
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index b1348a7001cd..2b173bb9a369 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -60,6 +60,7 @@ SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc *con
SwPageDesc::SwPageDesc( const SwPageDesc &rCpy )
: SwModify(nullptr)
+ , BroadcasterMixin()
, m_StyleName( rCpy.GetName() )
, m_NumType( rCpy.GetNumType() )
, m_Master( rCpy.GetMaster() )
diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx
index 019a3a6d7bf4..f0d5b7131769 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -39,6 +39,7 @@ SwFormatRefMark::SwFormatRefMark( const OUString& rName )
SwFormatRefMark::SwFormatRefMark( const SwFormatRefMark& rAttr )
: SfxPoolItem(RES_TXTATR_REFMARK)
, SwModify(nullptr)
+ , BroadcasterMixin()
, m_pTextAttr(nullptr)
, m_aRefName(rAttr.m_aRefName)
{
More information about the Libreoffice-commits
mailing list