summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-17 16:14:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-17 16:14:12 +0100
commit93bf853f66f438a8e21f365cb6b10050ec97eaf7 (patch)
tree9c1cca2e6e55e800cbe6902c00bfd1a93c9b8787 /sc/source/ui/undo
parentce2e94f2f1e5c38b728492ed1e95cf15335b6333 (diff)
Related: rhbz#711087 band-aid
Diffstat (limited to 'sc/source/ui/undo')
-rw-r--r--sc/source/ui/undo/undoblk.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index ced857fa66a6..16eed11a4aba 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -2084,6 +2084,9 @@ void ScUndoRemoveMerge::Undo()
for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
itr != itrEnd; ++itr)
{
+ OSL_ENSURE(pUndoDoc, "NULL pUndoDoc!");
+ if (!pUndoDoc)
+ continue;
// There is no need to extend merge area because it's already been extended.
ScRange aRange = maOption.getSingleRange(*itr);
pDoc->DeleteAreaTab(aRange, IDF_ATTRIB);