[Libreoffice-commits] core.git: include/svl svl/source

Jochen Nitschke j.nitschke+logerrit at ok.de
Fri Sep 29 13:24:55 UTC 2017


 include/svl/poolitem.hxx      |    3 ++-
 svl/source/items/poolitem.cxx |    7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 950742b3acf09cb5621e54a0e59ebfd2328d3d26
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Thu Sep 28 04:19:25 2017 +0200

    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 at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

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)


More information about the Libreoffice-commits mailing list