[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

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

New commits:
commit eda255b38d871bb7d20432e5730cc8c68b3e2942
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 22 20:17:01 2012 +0200

    SvTreeList: fix singular iterator compare assertions
    
    ... which will be introduced tomorrow by 3fa955d7
    
    Change-Id: I5d74a1c018fab69102382d6ea0b2739dd102e5bc

diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 48e6df7..8f15941 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1444,7 +1444,8 @@ std::pair<SvTreeEntryList::const_iterator,SvTreeEntryList::const_iterator>
 {
     typedef std::pair<SvTreeEntryList::const_iterator,SvTreeEntryList::const_iterator> IteratorPair;
 
-    IteratorPair aRet;
+    static const SvTreeEntryList dummy; // prevent singular iterator asserts
+    IteratorPair aRet(dummy.begin(), dummy.end());
 
     if (!pParent)
         pParent = pRootItem;
@@ -1464,7 +1465,8 @@ std::pair<SvTreeEntryList::iterator,SvTreeEntryList::iterator>
 {
     typedef std::pair<SvTreeEntryList::iterator,SvTreeEntryList::iterator> IteratorPair;
 
-    IteratorPair aRet;
+    static SvTreeEntryList dummy; // prevent singular iterator asserts
+    IteratorPair aRet(dummy.begin(), dummy.end());
 
     if (!pParent)
         pParent = pRootItem;