From ccf35dc1e35df8aaf2d6bdc585e99d3172c31c88 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 30 Mar 2005 07:52:35 +0000 Subject: INTEGRATION: CWS vcl38 (1.32.30); FILE MERGED 2005/03/18 11:45:52 pl 1.32.30.2: RESYNC: (1.32-1.33); FILE MERGED 2005/03/17 13:33:48 ssa 1.32.30.1: #i43523# check xPropSet before using --- toolkit/source/controls/unocontrol.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 027f50887b45..ce05b3959b44 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unocontrol.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: vg $ $Date: 2005-03-10 15:44:42 $ + * last change: $Author: rt $ $Date: 2005-03-30 08:52:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -347,8 +347,11 @@ void UnoControl::updateFromModel() if( getPeer().is() ) { Reference< XMultiPropertySet > xPropSet( mxModel, UNO_QUERY ); - Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); - xPropSet->firePropertiesChangeEvent( aNames, this ); + if( xPropSet.is() ) + { + Sequence< ::rtl::OUString> aNames = lcl_ImplGetPropertyNames( xPropSet ); + xPropSet->firePropertiesChangeEvent( aNames, this ); + } } } -- cgit