Skip to content

C
core
Kaydet (Commit) 1e022fda authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#735947 Explicit null dereferenced 

Change-Id: I8fc9d0eeab6f63be4c815adcbd092d5ff2a96586
üst 5c53bb8a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
sw/source/filter/ww8/wrtww8gr.cxx
Dosyayı görüntüle @ 1e022fda
...@@ -918,15 +918,16 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem) ...@@ -918,15 +918,16 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
case sw::Frame::eOle: case sw::Frame::eOle:
{ {
#ifdef OLE_PREVIEW_AS_EMF
const SwNode *pNode = rItem.maFly.GetContent(); const SwNode *pNode = rItem.maFly.GetContent();
const SwOLENode *pNd = pNode ? pNode->GetOLENode() : 0; const SwOLENode *pNd = pNode ? pNode->GetOLENode() : 0;
OSL_ENSURE(pNd, "Impossible"); OSL_ENSURE(pNd, "Impossible");
if (pNd)
{
#ifdef OLE_PREVIEW_AS_EMF
if (!rWrt.bWrtWW8) if (!rWrt.bWrtWW8)
{ {
SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd); 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() ); uno::Reference < embed::XEmbeddedObject > rObj( rSObj.GetOleRef() );
comphelper::EmbeddedObjectContainer aCnt( pOleNd->GetDoc()->GetDocStorage() ); comphelper::EmbeddedObjectContainer aCnt( pOleNd->GetDoc()->GetDocStorage() );
...@@ -968,7 +969,6 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem) ...@@ -968,7 +969,6 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
#else #else
// cast away const // cast away const
SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd); SwOLENode *pOleNd = const_cast<SwOLENode*>(pNd);
OSL_ENSURE( pOleNd, " Wer hat den OleNode versteckt ?" );
SwOLEObj& rSObj= pOleNd->GetOLEObj(); SwOLEObj& rSObj= pOleNd->GetOLEObj();
// TODO/LATER: do we need to load object? // TODO/LATER: do we need to load object?
...@@ -990,6 +990,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem) ...@@ -990,6 +990,7 @@ void SwWW8WrGrf::WriteGraphicNode(SvStream& rStrm, const GraphicDetails &rItem)
delete pGr; delete pGr;
#endif #endif
} }
}
break; break;
case sw::Frame::eDrawing: case sw::Frame::eDrawing:
case sw::Frame::eTxtBox: 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