INTEGRATION: CWS xmlfilter04 (1.5.80); FILE MERGED

2008/03/03 16:56:29 dr 1.5.80.1: check xInnerPropertySet to avoid crash

1 files changed, 6 insertions, 1 deletions

diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 7fd9d0853942..7e2c08de6972 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: WrappedNumberFormatProperty.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -173,6 +173,11 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue,
 Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
                         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
+    if( !xInnerPropertySet.is() )
+    {
+        DBG_ERROR("missing xInnerPropertySet in WrappedNumberFormatProperty::getPropertyValue");
+        return Any( false );
+    }
     bool bLink = ! xInnerPropertySet->getPropertyValue( C2U("NumberFormat" )).hasValue();
     return uno::makeAny( bLink );
 }