[Libreoffice-commits] .: svtools/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 29 18:57:03 PDT 2012


 svtools/source/contnr/treelist.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 04f4a0c1366d1863b93d7d84a8534791696b7477
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Oct 29 21:55:06 2012 -0400

    Somehow this change was lost during git rebase.
    
    Change-Id: Ic20584b5da2920dc8f2761b7f2c65c58713c5895

diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 9714697..a97c02b 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1378,8 +1378,7 @@ SvTreeList::GetChildIterators(const SvTreeListEntry* pParent) const
 {
     typedef std::pair<SvTreeListEntries::const_iterator, SvTreeListEntries::const_iterator> IteratorPair;
 
-    static const SvTreeEntryList dummy; // prevent singular iterator asserts
-    IteratorPair aRet(dummy.begin(), dummy.end());
+    IteratorPair aRet;
 
     if (!pParent)
         pParent = pRootItem;
@@ -1399,8 +1398,7 @@ std::pair<SvTreeListEntries::iterator, SvTreeListEntries::iterator>
 {
     typedef std::pair<SvTreeListEntries::iterator, SvTreeListEntries::iterator> IteratorPair;
 
-    static SvTreeEntryList dummy; // prevent singular iterator asserts
-    IteratorPair aRet(dummy.begin(), dummy.end());
+    IteratorPair aRet;
 
     if (!pParent)
         pParent = pRootItem;


More information about the Libreoffice-commits mailing list