diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:51:08 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:51:08 +0000 |
commit | ba333b0efd6fc86c3ed4cfd8bd0893e28ced8ee5 (patch) | |
tree | e3cbf5a7e71b96dde9538863c39e5ba15f2a2603 /sw/source/filter/xml/xmltexti.cxx | |
parent | 6e32e9e5a7d969d41f1e9841c0a52e2c4e679c53 (diff) |
INTEGRATION: CWS sw8u10bf03 (1.51.116); FILE MERGED
2007/12/07 11:08:04 ama 1.51.116.1: #i84340#: Crash import bug document
Diffstat (limited to 'sw/source/filter/xml/xmltexti.cxx')
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index accdfaca8945..e6515365bd85 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmltexti.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: hr $ $Date: 2007-09-27 10:14:39 $ + * last change: $Author: ihi $ $Date: 2008-01-15 13:51:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -432,8 +432,11 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( // the correct aspect will be set later // TODO/LATER: Actually it should be set here - pFrmFmt = pDoc->InsertOLE( *pTxtCrsr->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, NULL, NULL ); - pOLENd = lcl_GetOLENode( pFrmFmt ); + if( pTxtCrsr ) + { + pFrmFmt = pDoc->InsertOLE( *pTxtCrsr->GetPaM(), aName, embed::Aspects::MSOLE_CONTENT, &aItemSet, NULL, NULL ); + pOLENd = lcl_GetOLENode( pFrmFmt ); + } aObjName = aName; } |