[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Norbert Thiebaud]

 sc/source/filter/html/htmlpars.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cf5849feb5c0f4338af8700cfe01d935dfbb2be9
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Jun 9 00:13:21 2011 -0400

    fdo#37673: Fix a crasher during HTML import on Windows.

diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 7af88be..c7a79a1 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1832,7 +1832,7 @@ public:
         @param pTableMap  Pointer to the table map (is allowed to be NULL). */
     explicit            ScHTMLTableIterator( const ScHTMLTableMap* pTableMap );
 
-    inline bool         is() const { return maIter != maEnd; }
+    inline bool         is() const { return mpTableMap && maIter != maEnd; }
     inline ScHTMLTable* operator->() { return maIter->second.get(); }
     inline ScHTMLTable& operator*() { return *maIter->second; }
     inline ScHTMLTableIterator& operator++() { ++maIter; return *this; }
@@ -1840,9 +1840,11 @@ public:
 private:
     ScHTMLTableMap::const_iterator maIter;
     ScHTMLTableMap::const_iterator maEnd;
+    const ScHTMLTableMap* mpTableMap;
 };
 
-ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap )
+ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ) :
+    mpTableMap(pTableMap)
 {
     if( pTableMap )
     {