diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-30 10:02:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-30 10:04:26 +0100 |
| commit | c38d460d8112079c83c6a5175bdc8cc019328c1c (patch) | |
| tree | 1b0d0df6edafcdc7f4550743278705b18697f4c6 /svtools | |
| parent | fd443f82bc7b59e97e9a49c54fe72ec18517d627 (diff) | |
Reapply eda255b38d871bb7d20432e5730cc8c68b3e2942
... "SvTreeList: fix singular iterator compare assertions" after commits that
broke it again.
Change-Id: I527fe37e2a0a9f6fbba468261892379920f02c10
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/treelist.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index e489c7c1978e..895ef9715903 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1378,7 +1378,8 @@ SvTreeList::GetChildIterators(const SvTreeListEntry* pParent) const { typedef std::pair<SvTreeListEntries::const_iterator, SvTreeListEntries::const_iterator> IteratorPair; - IteratorPair aRet; + static const SvTreeListEntries dummy; // prevent singular iterator asserts + IteratorPair aRet(dummy.begin(), dummy.end()); if (!pParent) pParent = pRootItem; @@ -1398,7 +1399,8 @@ std::pair<SvTreeListEntries::iterator, SvTreeListEntries::iterator> { typedef std::pair<SvTreeListEntries::iterator, SvTreeListEntries::iterator> IteratorPair; - IteratorPair aRet; + static SvTreeListEntries dummy; // prevent singular iterator asserts + IteratorPair aRet(dummy.begin(), dummy.end()); if (!pParent) pParent = pRootItem; |