[Libreoffice-commits] .: sc/source

Kohei Yoshida kohei at kemper.freedesktop.org
Fri Feb 11 23:02:24 PST 2011


 sc/source/ui/docshell/externalrefmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39647f4711af6a6d50ff58754004874ec42265ce
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sat Feb 12 01:59:34 2011 -0500

    Fixed a crasher during external cell value query.
    
    pFmt is sometimes NULL.  We need to check that.

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 344ff82..3483895 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1697,7 +1697,7 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken(
     // Now, insert the token into cache table but don't cache empty cells.
     if (pToken->GetType() != formula::svEmptyCell)
     {
-        nFmtIndex = pFmt->mbIsSet ? pFmt->mnIndex : 0;
+        nFmtIndex = (pFmt && pFmt->mbIsSet) ? pFmt->mnIndex : 0;
         maRefCache.setCellData(nFileId, rTabName, rCell.Col(), rCell.Row(), pToken, nFmtIndex);
     }
 


More information about the Libreoffice-commits mailing list