[Libreoffice-commits] .: sc/source

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Tue Jun 7 02:59:55 PDT 2011


 sc/source/core/data/dociter.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1de9151e419573688f6665f8b7aad6746114ff9c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Jun 7 11:57:29 2011 +0200

    remove warning, I hope this will help norbert's tinderbox

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f625e4c..550996c 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -93,7 +93,7 @@ ScDocumentIterator::~ScDocumentIterator()
 
 sal_Bool ScDocumentIterator::GetThisCol()
 {
-    ScTable*		pTab;
+    ScTable*		pTab = NULL;
     while ( nTab < pDoc->GetTableCount() && (pTab = pDoc->pTab[nTab]) == NULL )
     {
         if ( nTab == nEndTab )
@@ -104,6 +104,11 @@ sal_Bool ScDocumentIterator::GetThisCol()
         }
         ++nTab;
     }
+    if (pTab == NULL)
+    {
+        OSL_FAIL("no table in document?");
+        return false;
+    }
     ScColumn*		pCol = &pTab->aCol[nCol];
     ScAttrArray*	pAtt = pCol->pAttrArray;
 


More information about the Libreoffice-commits mailing list