summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-10 16:19:19 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-03-11 01:16:33 +0000
commitffe060e954d172f8603a4e9f625445e49132c7bf (patch)
tree4a939673cd597c0812261fe28da2103526ac51a2 /svx
parentd59358ee28f0cd3e1eb56a0a923f165304fc17c9 (diff)
V668 no sense in testing the result of new against null
Change-Id: I7783d96e40de7a8df794f143d2c7830bf3314218
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/contwnd.cxx15
-rw-r--r--svx/source/form/datanavi.cxx6
-rw-r--r--svx/source/form/tabwin.cxx7
-rw-r--r--svx/source/sidebar/nbdtmg.cxx2
4 files changed, 11 insertions, 19 deletions
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 7587a24b4d9b..cea52c2aa502 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -67,18 +67,15 @@ void ContourWindow::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly )
aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon());
SdrPathObj* pPathObj = new SdrPathObj( OBJ_PATHFILL, aPolyPolygon );
- if ( pPathObj )
- {
- SfxItemSet aSet( pModel->GetItemPool() );
+ SfxItemSet aSet( pModel->GetItemPool() );
- aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
- aSet.Put( XFillColorItem( "", TRANSCOL ) );
- aSet.Put( XFillTransparenceItem( 50 ) );
+ aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
+ aSet.Put( XFillColorItem( "", TRANSCOL ) );
+ aSet.Put( XFillTransparenceItem( 50 ) );
- pPathObj->SetMergedItemSetAndBroadcast(aSet);
+ pPathObj->SetMergedItemSetAndBroadcast(aSet);
- pPage->InsertObject( pPathObj );
- }
+ pPage->InsertObject( pPathObj );
}
if ( nPolyCount )
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 90813610c0ef..1b2f7738e66d 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -205,10 +205,8 @@ namespace svxform
}
OXFormsTransferable *pTransferable = new OXFormsTransferable(desc);
Reference< XTransferable > xEnsureDelete = pTransferable;
- if(pTransferable) {
- EndSelection();
- pTransferable->StartDrag( this, DND_ACTION_COPY );
- }
+ EndSelection();
+ pTransferable->StartDrag( this, DND_ACTION_COPY );
}
PopupMenu* DataTreeListBox::CreateContextMenu()
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 60edd9b1b99e..da4ad2d6ada4 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -159,11 +159,8 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
aDescriptor, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR
);
Reference< XTransferable> xEnsureDelete = pTransferColumn;
- if (pTransferColumn)
- {
- EndSelection();
- pTransferColumn->StartDrag( this, DND_ACTION_COPY );
- }
+ EndSelection();
+ pTransferColumn->StartDrag( this, DND_ACTION_COPY );
}
FmFieldWinData::FmFieldWinData()
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index e2ae2864fce2..de02aa9a5e6e 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -524,7 +524,7 @@ GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr& aTy
{
GrfBulDataRelation* pEntry = new GrfBulDataRelation(eNBType::GRAPHICBULLETS);
GrfBulDataRelation* pSrcEntry = aTypeMgr.aGrfDataLst[i];
- if ( pEntry && pSrcEntry)
+ if (pSrcEntry)
{
pEntry->bIsCustomized = pSrcEntry->bIsCustomized;
pEntry->nTabIndex = pSrcEntry->nTabIndex;