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

[Caolán McNamara]

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

New commits:
commit 0c3211b1f20383b4fbee8978e88c21e498e35047
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 5 16:25:16 2013 +0000

    crash on exit from xml form document with accessibility enabled
    
    Change-Id: If60075b939569cf339f7ccf7e39e513fbe1f74bf

diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 8500425..4cac34b 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;
 }
 
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 661e109..1602cd3 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -4081,8 +4081,8 @@ void SvTreeListBox::FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl:
         SvViewDataEntry* pViewDataNewCur = 0;
         if( pEntry )
         {
-            pViewDataNewCur= GetViewDataEntry(pEntry);
-            if(pViewDataNewCur->HasFocus())
+            pViewDataNewCur = GetViewDataEntry(pEntry);
+            if (pViewDataNewCur && pViewDataNewCur->HasFocus())
                 rStateSet.AddState( AccessibleStateType::FOCUSED );
         }
     }