diff options
| author | Eike Rathke <er@openoffice.org> | 2002-01-21 15:27:48 +0000 |
|---|---|---|
| committer | Eike Rathke <er@openoffice.org> | 2002-01-21 15:27:48 +0000 |
| commit | af99b7da7e45276a3c6763f93b94c988baec29ae (patch) | |
| tree | 181110e24cff5685f0e18e5acca2fe9bb9cac54a /sc/source/ui/docshell/docsh3.cxx | |
| parent | b6f63b3a5ddaca10411942fb59d16749ed1ba4e3 (diff) | |
#96773# MergeDocument: deleted contents have a NULL new cell pointer
Diffstat (limited to 'sc/source/ui/docshell/docsh3.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index df9834090752..a82c92952ade 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh3.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: sab $ $Date: 2001-09-28 17:16:55 $ + * last change: $Author: er $ $Date: 2002-01-21 16:27:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -889,7 +889,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc ) ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); BYTE eMatrix = MM_NONE; const ScBaseCell* pCell = ((const ScChangeActionContent*)pSourceAction)->GetNewCell(); - if ( pCell->GetCellType() == CELLTYPE_FORMULA ) + if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA ) eMatrix = ((const ScFormulaCell*)pCell)->GetMatrixFlag(); switch ( eMatrix ) { |