diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-01 18:01:31 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-01 23:16:00 +0200 |
| commit | f780a64a4f62bb7884d9dcfd984dc96ab737b34e (patch) | |
| tree | ab3f620a452e2032cabc2bd6879a1c6cab569cc5 /unotools | |
| parent | f4103a42d58535e21c48ff94ab000ab0305c62e3 (diff) | |
Consistently have both copy functions for utl::ConfigurationBroadcaster
The ctor was added with d1e47b1428abf1732ab4d5e219b210760d4152e0 "enhance
useuniqueptr loplugin" apparently because it was needed and the implicitly
declared one stareted to be defined as deleted, while the assignment op was
left implicitly defined as deleted (presumably because it wasn't needed anyway).
Adding a non-deleted definition of the assignment op probably is a good move
towards consistency, and was assumed it could help avoid new Clang trunk
-Werror,-Wdefaulted-function-deleted in derived ConfigItem
(include/unotools/configitem.hxx), but which appears not to be the case.
And ConfigurationBroadcaster can't easily switch from copy to move semantics, as
SdOptionsLayoutItem::Clone needs SdOptionsLayoutItem copy ctor needs
SdOptionsLayout copy ctor needs SdOptionsGeneric copy ctor needs
SdOptionsItem copy ctor needs utl::ConfigItem copy ctor needs
utl::ConfigurationBroadcaster copy ctor.
Change-Id: Ie1f4e72eacb9b6b776103c4cf04a959acfa6648f
Reviewed-on: https://gerrit.libreoffice.org/61208
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/options.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx index 11a396287ad8..977f185b42b8 100644 --- a/unotools/source/config/options.cxx +++ b/unotools/source/config/options.cxx @@ -42,6 +42,18 @@ ConfigurationBroadcaster::~ConfigurationBroadcaster() { } +ConfigurationBroadcaster & ConfigurationBroadcaster::operator =( + ConfigurationBroadcaster const & other) +{ + if (&other != this) { + mpList.reset( + other.mpList == nullptr ? nullptr : new IMPL_ConfigurationListenerList(*other.mpList)); + m_nBroadcastBlocked = other.m_nBroadcastBlocked; + m_nBlockedHint = other.m_nBlockedHint; + } + return *this; +} + void ConfigurationBroadcaster::AddListener( utl::ConfigurationListener* pListener ) { if ( !mpList ) |