ooo-build r12853 - in trunk: . patches/dev300

[freuter svn gnome org]

Author: freuter
Date: Tue Jun 10 15:13:04 2008
New Revision: 12853
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12853&view=rev

Log:
Fixed ODF import crash caused by invalid ODF document. See i#90562.

Added:
   trunk/patches/dev300/xmloff-import-crash-fix-for-i90562.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jun 10 15:13:04 2008
@@ -2104,7 +2104,7 @@
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 cairocanvas-image-borders.diff, n#340142, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
-
+xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
 
 [ EMFPlus ]
 emf+-canvas.diff

Added: trunk/patches/dev300/xmloff-import-crash-fix-for-i90562.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/xmloff-import-crash-fix-for-i90562.diff	Tue Jun 10 15:13:04 2008
@@ -0,0 +1,19 @@
+Index: xmloff/source/forms/elementimport.cxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/forms/elementimport.cxx,v
+retrieving revision 1.58
+diff -u -r1.58 elementimport.cxx
+--- xmloff/source/forms/elementimport.cxx	31 Jul 2007 13:40:33 -0000	1.58
++++ xmloff/source/forms/elementimport.cxx	10 Jun 2008 15:04:45 -0000
+@@ -598,7 +598,10 @@
+ 	//---------------------------------------------------------------------
+ 	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 ) )