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

[Libreoffice Gerrit user]

 sc/source/filter/oox/extlstcontext.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6232eeaa90643f2e067145296f8e97fb16f7ecf5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 28 01:21:41 2012 +0200

    ooxml spec allow ext ref to non existent entry, fdo#54558
    
    Change-Id: I717917d04a93975472d60248eb61066cd04d1bbe
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 740a841..d5cc534 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -170,7 +170,13 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A
         if(nElement == XLS_EXT_TOKEN( cfRule ))
         {
             rtl::OUString aId = rAttribs.getString( XML_id, rtl::OUString() );
-            void* pInfo = getExtLst().find( aId )->second;
+
+            // an ext entrie does not need to have an existing corresponding entry
+            ExtLst::const_iterator aExt = getExtLst().find( aId );
+            if(aExt == getExtLst().end())
+                return NULL;
+
+            void* pInfo = aExt->second;
             if (!pInfo)
             {
                 return NULL;