From 841bf692f01029625877ee9eae1f2ed98a11e56a Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 7 Nov 2006 14:20:10 +0000 Subject: INTEGRATION: CWS fwk55 (1.20.8); FILE MERGED 2006/10/23 07:35:30 pb 1.20.8.1: fix: #i67976# made code safer --- svx/source/dialog/selector.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'svx/source/dialog') diff --git a/svx/source/dialog/selector.cxx b/svx/source/dialog/selector.cxx index 56d5064f97a9..ba0d52df1d40 100644 --- a/svx/source/dialog/selector.cxx +++ b/svx/source/dialog/selector.cxx @@ -4,9 +4,9 @@ * * $RCSfile: selector.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: vg $ $Date: 2006-11-01 15:00:30 $ + * last change: $Author: kz $ $Date: 2006-11-07 15:20:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -587,6 +587,8 @@ void SvxConfigGroupListBox_Impl::Init( SvStringsDtor * ) node is a first level child of the Root and is NOT either the current document, user or share */ Reference< browse::XBrowseNode >& theChild = children[n]; + if ( !theChild.is() ) + continue; ::rtl::OUString uiName = theChild->getName(); BOOL bDisplay = TRUE; @@ -905,6 +907,8 @@ void SvxConfigGroupListBox_Impl::GroupSelected() for ( long n = 0; n < children.getLength(); n++ ) { + if (!children[n].is()) + continue; if (children[n]->getType() == browse::BrowseNodeTypes::SCRIPT) { OUString uri; @@ -1060,8 +1064,9 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) node is a first level child of the Root and is NOT either the current document, user or share */ Reference< browse::XBrowseNode >& theChild = children[n]; + //#139111# some crash reports show that it might be unset - if(!theChild.is()) + if ( !theChild.is() ) continue; ::rtl::OUString uiName = theChild->getName(); BOOL bDisplay = TRUE; -- cgit