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

Takeshi Abe tabe at fixedpoint.jp
Fri Oct 20 05:57:10 UTC 2017


 include/svtools/treelistentry.hxx       |    2 +-
 svtools/source/contnr/treelistentry.cxx |   13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 44f54bf392375b789e3e3c3e868c9426d6cd4e41
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Oct 18 17:22:02 2017 +0900

    svtools: SvTreeListEntry's copy ctor is unnecessary
    
    Change-Id: Idce8773d96e30dacfc9ce13fdb9b399c2a8bf341
    Reviewed-on: https://gerrit.libreoffice.org/43485
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx
index 57a7056cdad7..899e3f8bbc96 100644
--- a/include/svtools/treelistentry.hxx
+++ b/include/svtools/treelistentry.hxx
@@ -70,13 +70,13 @@ private:
     void SetListPositions();
     void InvalidateChildrensListPositions();
 
+    SvTreeListEntry(const SvTreeListEntry& r) = delete;
     void operator=(SvTreeListEntry const&) = delete;
 
 public:
     static const size_t ITEM_NOT_FOUND = SAL_MAX_SIZE;
 
     SvTreeListEntry();
-    SvTreeListEntry(const SvTreeListEntry& r);
     virtual ~SvTreeListEntry();
 
     bool HasChildren() const;
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index 72436e9f5fa6..aab1f37597c2 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 #include <svtools/treelistentry.hxx>
 #include <svtools/treelist.hxx>
-#include <o3tl/make_unique.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
@@ -60,18 +59,6 @@ SvTreeListEntry::SvTreeListEntry()
 {
 }
 
-SvTreeListEntry::SvTreeListEntry(const SvTreeListEntry& r)
-    : pParent(nullptr)
-    , nAbsPos(r.nAbsPos)
-    , nListPos(r.nListPos & 0x7FFFFFFF)
-    , pUserData(r.pUserData)
-    , nEntryFlags(r.nEntryFlags)
-    , maBackColor(Application::GetSettings().GetStyleSettings().GetWindowColor())
-{
-    for (auto const& it : r.m_Children)
-        m_Children.push_back(o3tl::make_unique<SvTreeListEntry>(*it));
-}
-
 SvTreeListEntry::~SvTreeListEntry()
 {
 #ifdef DBG_UTIL


More information about the Libreoffice-commits mailing list