diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 16:05:46 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-05 16:05:46 +0100 |
commit | 0065cb5d48033517ea276ee3a64ea754cca615a8 (patch) | |
tree | f092035ca5adfa22004c7685e8765c1d7584750b /sw | |
parent | 32ffdd367f5ef9e9af747bda9d46e90997a95e19 (diff) |
coverity#1233485 Dereference after null check
Change-Id: Id862a827cde1492aa6e78f20ab5bf78e405c5dd9
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 616631b7be3a..570af9bbaba6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3689,12 +3689,10 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const Sw //Get original size in twips Size aSize(sw::util::GetSwappedInSize(*pGrfNode)); Size aRendered(aSize); - if (pFlyFrmFmt) - { - const SwFmtFrmSize& rS = pFlyFrmFmt->GetFrmSize(); - aRendered.Width() = rS.GetWidth(); - aRendered.Height() = rS.GetHeight(); - } + + const SwFmtFrmSize& rS = pFlyFrmFmt->GetFrmSize(); + aRendered.Width() = rS.GetWidth(); + aRendered.Height() = rS.GetHeight(); sw::Frame* pFrame = 0; for (sw::FrameIter it = m_rExport.maFrames.begin(); it != m_rExport.maFrames.end(); ++it) |