summaryrefslogtreecommitdiff
path: root/svx/source/table/tablertfimporter.cxx
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-06-09 14:25:21 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-06-09 14:25:21 +0000
commit58f9ce012e902af26b4021fe50b20a7da91ee7bd (patch)
treec5c3a2263800f2cd4665d6b6ec2db52304719558 /svx/source/table/tablertfimporter.cxx
parentf9421f52b6c7447b9e3fca7d33515b0154a379b2 (diff)
INTEGRATION: CWS impress141 (1.3.14); FILE MERGED
2008/04/29 15:42:51 cl 1.3.14.1: #i88852# do not crash on mallformed rtf, even from calc
Diffstat (limited to 'svx/source/table/tablertfimporter.cxx')
-rw-r--r--svx/source/table/tablertfimporter.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 2322aaa41f4f..73e2c7739d71 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: tablertfimporter.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@@ -282,7 +282,7 @@ void SdrTableRTFParser::FillTable()
RTFCellInfoPtr xCellInfo( (*xColumn)[nCol] );
CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) );
- if( xCell.is() )
+ if( xCell.is() && xCellInfo.get() )
{
const SfxPoolItem *pPoolItem = 0;
if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,FALSE,&pPoolItem)==SFX_ITEM_SET)