diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-10 21:32:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-10 22:11:33 +0100 |
| commit | 88b104f44acff8087dfe3833bb91c63604ced98b (patch) | |
| tree | 6c7aee2f8cf919d994e1b9640ab8c1dd921837f8 /sfx2 | |
| parent | dc4d9481f36a18db1dfe3b931780edbe32266e5f (diff) | |
coverity#1302618 deref of NULL
on examination this PreparePaint virtual is only called from
SvTreeListBox::PaintEntry1
and PaintEntry1 is only called from SvImpLBox::Paint in a
for(sal_uInt16 n=0; n< nCount && pEntry; n++)
{
/*long nMaxRight=*/
pView->PaintEntry1
loop so pEntry always exists given that test. Re-jig things
so these families of method take a reference instead of a pointer
so verifying it cannot be NULL and a whole pile of else paths
fall away
Change-Id: Ied40acb1c2263c21b4447832f8cb86f64ed9e80d
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 8da087087f0c..aa0bcdabe3ac 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -93,7 +93,7 @@ public: SvTreeListBox& rDevice, vcl::RenderContext& rRenderContext, const SvViewDataEntry* pView, - const SvTreeListEntry* pEntry) SAL_OVERRIDE; + const SvTreeListEntry& rEntry) SAL_OVERRIDE; virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, @@ -145,11 +145,8 @@ void StyleLBoxString::InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry void StyleLBoxString::Paint( const Point& aPos, SvTreeListBox& /*rDevice*/, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) + const SvViewDataEntry* pView, const SvTreeListEntry& /*rEntry*/) { - if (!pEntry) - return; - bool bResult = false; if (mpStylePreviewRenderer) |