[Libreoffice-commits] .: sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jun 17 08:14:38 PDT 2011
sc/source/ui/undo/undoblk.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit fe44d66adbab17b804a27d91148490b23fce75da
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 17 16:14:12 2011 +0100
Related: rhbz#711087 band-aid
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 8439801..d535c9c 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);
More information about the Libreoffice-commits
mailing list