[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 16343a0d850d0753acb36ff6b05985a9b60eca13
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 4 12:49:08 2012 +0100

    Related: rhbz#862467 band-aid when creating embedded object fails
    
    Change-Id: Ie5ecc8f56636e692a6e17a2e8fab0cefd46cdfb4
    (cherry picked from commit 0f3f9cb63056715845d9c3565bde69470c73efb2)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 9667c79..097fb3f 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2451,6 +2451,9 @@ void OOXMLFastContextHandlerMath::process()
     comphelper::EmbeddedObjectContainer container;
     rtl::OUString aName;
     uno::Reference< embed::XEmbeddedObject > ref = container.CreateEmbeddedObject( name.GetByteSequence(), aName );
+    assert(ref.is());
+    if (!ref.is())
+        return;
     uno::Reference< uno::XInterface > component( ref->getComponent(), uno::UNO_QUERY );
 // gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class,
 // so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated