summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-12-05 16:25:16 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-12-05 16:39:08 +0000
commit2140ea5569588155702580eefef2c168d5c701d8 (patch)
treedd9390bc50a20f7ac91dc04a9375c1454b2893dc /svtools
parent959a610d5dc76383e46d5c5200c6126e1e60a50d (diff)
crash on exit from xml form document with accessibility enabled
(cherry picked from commit 0c3211b1f20383b4fbee8978e88c21e498e35047) Conflicts: svtools/source/contnr/treelistbox.cxx Change-Id: If60075b939569cf339f7ccf7e39e513fbe1f74bf
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/treelist.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 8500425ce82d..4cac34b39e05 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1472,7 +1472,8 @@ sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvDataTable::const_iterator itr = maDataTable.find(pEntry );
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
+ if (itr == maDataTable.end())
+ return false;
return itr->second->IsSelected();
}
@@ -1487,7 +1488,8 @@ void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus )
const SvViewDataEntry* SvListView::GetViewData( const SvTreeListEntry* pEntry ) const
{
SvDataTable::const_iterator itr = maDataTable.find( const_cast<SvTreeListEntry*>(pEntry) );
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
+ if (itr == maDataTable.end())
+ return NULL;
return itr->second;
}