summaryrefslogtreecommitdiff
path: root/xmloff/source/forms
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-10-14 05:23:43 +0000
committerOliver Bolte <obo@openoffice.org>2008-10-14 05:23:43 +0000
commit0a6f995f4e6739636123a9829b5e22ea04b52f72 (patch)
tree65e063a7ebfb79d2f184338c18cc2b66e568a480 /xmloff/source/forms
parentf88f6451fb99709768369d774f6eff35b3715902 (diff)
CWS-TOOLING: integrate CWS mba30fixes02
Diffstat (limited to 'xmloff/source/forms')
-rw-r--r--xmloff/source/forms/elementimport.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index e6049af575..3726a92966 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: elementimport.cxx,v $
- * $Revision: 1.60 $
+ * $Revision: 1.60.56.1 $
*
* This file is part of OpenOffice.org.
*
@@ -543,7 +543,10 @@ namespace xmloff
//---------------------------------------------------------------------
void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault)
{
- Reference< XPropertySetInfo > xPropsInfo = m_xElement->getPropertySetInfo();
+ Reference< XPropertySetInfo > xPropsInfo;
+ if ( m_xElement.is()) {
+ xPropsInfo=m_xElement->getPropertySetInfo();
+ }
OSL_ENSURE( xPropsInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" );
if ( !xPropsInfo.is() || xPropsInfo->hasPropertyByName( _rPropertyName ) )