[Libreoffice-commits] core.git: sw/source

Caolán McNamara caolanm at redhat.com
Sun Sep 17 11:54:48 UTC 2017


 sw/source/core/ole/ndole.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96d90bd4df3394f177dc069ab81ba3f1f24ff2ed
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 16 21:09:08 2017 +0100

    ofz: check if fallback creation fails
    
    Change-Id: If64965f8ced5840a7687c60f20a407e53938c227
    Reviewed-on: https://gerrit.libreoffice.org/42371
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 909938f2c142..d4b9b0a74a40 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -906,7 +906,7 @@ const uno::Reference < embed::XEmbeddedObject > SwOLEObj::GetOleRef()
             OUString aTmpName;
             xObj = p->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_DUMMY_CLASSID ).GetByteSequence(), aTmpName );
         }
-        // else
+        if (xObj.is())
         {
             m_xOLERef.Assign( xObj, m_xOLERef.GetViewAspect() );
             m_xOLERef.AssignToContainer( &p->GetEmbeddedObjectContainer(), m_aName );


More information about the Libreoffice-commits mailing list