Kaydet (Commit) 1e022fda authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#735947 Explicit null dereferenced

Change-Id: I8fc9d0eeab6f63be4c815adcbd092d5ff2a96586
üst 5c53bb8a
......@@ -918,15 +918,16 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
case sw::Frame::eOle:
{
#ifdef OLE_PREVIEW_AS_EMF
const SwNode *pNode = rItem.maFly.GetContent();
const SwOLENode *pNd = pNode ? pNode->GetOLENode() : 0;
OSL_ENSURE(pNd, "Impossible");
if (pNd)
{
#ifdef OLE_PREVIEW_AS_EMF
if (!rWrt.bWrtWW8)
{
SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd);
OSL_ENSURE( pOleNd, " Wer hat den OleNode versteckt ?" );
SwOLEObj& rSObj= pOleNd->GetOLEObj();
SwOLEObj& rSObj = pOleNd->GetOLEObj();
uno::Reference < embed::XEmbeddedObject > rObj( rSObj.GetOleRef() );
comphelper::EmbeddedObjectContainer aCnt( pOleNd->GetDoc()->GetDocStorage() );
......@@ -968,7 +969,6 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
#else
// cast away const
SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd);
OSL_ENSURE( pOleNd, " Wer hat den OleNode versteckt ?" );
SwOLEObj& rSObj= pOleNd->GetOLEObj();
// TODO/LATER: do we need to load object?
......@@ -990,6 +990,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
delete pGr;
#endif
}
}
break;
case sw::Frame::eDrawing:
case sw::Frame::eTxtBox:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment