summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unodraw.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-12 09:09:56 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-12 09:28:13 +0100
commit510b667023ac2069021f9ccd76efd4989e09a1ce (patch)
tree72ccf84d39eea46af26b0717366ce5dc8fcc2050 /sw/source/core/unocore/unodraw.cxx
parenta31874f38a179d89dcc9eaedcbcf21dc34f3b9fe (diff)
coverity#1406101 Dereference null return value
and coverity#1406100 Dereference null return value coverity#1406099 Dereference null return value coverity#1406098 Dereference null return value coverity#1406097 Dereference null return value Change-Id: I26d5c0f2e69dc049a87a607ca28586dc575a8ca3
Diffstat (limited to 'sw/source/core/unocore/unodraw.cxx')
-rw-r--r--sw/source/core/unocore/unodraw.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 6f4c5d2de9d2..b155e81b2c0d 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1273,9 +1273,10 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
SwTextAttr * const pHint =
pTextNode->GetTextAttrForCharAt(
nIdx, RES_TXTATR_FLYCNT );
- SAL_WARN_IF( !pHint || pHint->Which() != RES_TXTATR_FLYCNT,
+ assert(pHint && "Missing Hint.");
+ SAL_WARN_IF( pHint->Which() != RES_TXTATR_FLYCNT,
"sw.uno", "Missing FlyInCnt-Hint." );
- SAL_WARN_IF( !pHint || pHint->GetFlyCnt().GetFrameFormat() != pFlyFormat,
+ SAL_WARN_IF( pHint->GetFlyCnt().GetFrameFormat() != pFlyFormat,
"sw.uno", "Wrong TextFlyCnt-Hint." );
const_cast<SwFormatFlyCnt&>(pHint->GetFlyCnt())
.SetFlyFormat();