diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-09-28 04:19:25 +0200 |
---|---|---|
committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-09-29 15:24:32 +0200 |
commit | 950742b3acf09cb5621e54a0e59ebfd2328d3d26 (patch) | |
tree | 556e2bd50dfa13a74aa1c9e5ebad93b1959b655a | |
parent | a845cc801582ef96309021be078fb7e10f4a0366 (diff) |
inline SfxPoolItem copy constructor
as delegating constructor.
In preparation to remove default able copy constructors
of derived classes.
Change-Id: I516efa70ef2a06079194aafbf630e151138c6bbc
Reviewed-on: https://gerrit.libreoffice.org/42923
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
-rw-r--r-- | include/svl/poolitem.hxx | 3 | ||||
-rw-r--r-- | svl/source/items/poolitem.cxx | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 2977ae7298f2..82b27c115c47 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -137,7 +137,8 @@ private: protected: explicit SfxPoolItem( sal_uInt16 nWhich = 0 ); - SfxPoolItem( const SfxPoolItem& ); + SfxPoolItem( const SfxPoolItem& rCopy) + : SfxPoolItem(rCopy.m_nWhich) {} public: virtual ~SfxPoolItem(); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 4fbd3c9f5fd6..aebe8cda4389 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -35,13 +35,6 @@ SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich) } -SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy ) - : m_nRefCount(0) // don't copy that - , m_nWhich(rCpy.m_nWhich) - , m_nKind(SfxItemKind::NONE) -{} - - SfxPoolItem::~SfxPoolItem() { assert((m_nRefCount == 0 || m_nRefCount > SFX_ITEMS_MAXREF) |