diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-18 12:21:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-18 14:24:11 +0100 |
| commit | 8a6eb111609fbb1e0270ef5ba475b027635c9749 (patch) | |
| tree | 50933f1d17b817615a9c8685eaf8311839c60584 /sw/source/filter/ww8/ww8par4.cxx | |
| parent | 3323937085939952aaf0a98147d231dfdfb85321 (diff) | |
cppcheck: nullPointerRedundantCheck
Change-Id: I9d6c38ad3104369c7661bc8a8561807598aecfcb
Diffstat (limited to 'sw/source/filter/ww8/ww8par4.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 02f2e2f6ac98..867ea7ad54d2 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -144,23 +144,23 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, if( pMfp->mm == 94 || pMfp->mm == 99 ) { - OSL_ENSURE( !pSt, "+OLE: wrong metafile type" ); + SAL_WARN("sw.ww8", "+OLE: wrong metafile type"); return false; } if( pMfp->mm != 8 ) { - OSL_ENSURE( !pSt, "+OLE: wrong mMetafile type (not anisotropic)" ); + SAL_WARN("sw.ww8", "OLE: wrong mMetafile type (not anisotropic)"); } if( !pMfp->xExt || !pMfp->yExt ) { - OSL_ENSURE( !pSt, "+OLE: size of 0?" ); + SAL_WARN("sw.ww8", "+OLE: size of 0?"); return false; } bool bOk = ReadWindowMetafile( *pSt, rWMF ); // read WMF // *pSt >> aWMF doesn't work without the placable header if (!bOk || pSt->GetError() || rWMF.GetActionSize() == 0) { - OSL_ENSURE( !pSt, "+OLE: could not read the metafile" ); + SAL_WARN("sw.ww8", "+OLE: could not read the metafile"); return false; } |