summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-12 10:04:35 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-12 11:02:14 +0000
commita91d7e2d33d3c29afb78f05fb70cf5b03c97fb3a (patch)
treeb754a62b3bca468253eb4a24353167d2c53ed46c /sd
parentd37f5fdd7310a031f3946f51133d18317f877dae (diff)
coverity#704766 Dereference after null check
Change-Id: I8491260f198e80138241de891ef29cc8ab21a008
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/controller/SlsTransferableData.cxx19
1 files changed, 8 insertions, 11 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index baa5c3b3531c..485198965534 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
@@ -38,24 +38,21 @@ SdTransferable* TransferableData::CreateTransferable (
return pTransferable;
}
-
-
-
::boost::shared_ptr<TransferableData> TransferableData::GetFromTransferable (const SdTransferable* pTransferable)
{
- ::boost::shared_ptr<TransferableData> pData;
- for (sal_Int32 nIndex=0,nCount=pTransferable->GetUserDataCount(); nIndex<nCount; ++nIndex)
+ if (pTransferable)
{
- pData = ::boost::dynamic_pointer_cast<TransferableData>(pTransferable->GetUserData(nIndex));
- if (pData)
- return pData;
+ for (sal_Int32 nIndex=0,nCount=pTransferable->GetUserDataCount(); nIndex<nCount; ++nIndex)
+ {
+ ::boost::shared_ptr<TransferableData> xData =
+ ::boost::dynamic_pointer_cast<TransferableData>(pTransferable->GetUserData(nIndex));
+ if (xData)
+ return xData;
+ }
}
return ::boost::shared_ptr<TransferableData>();
}
-
-
-
TransferableData::TransferableData (
SlideSorterViewShell* pViewShell,
const ::std::vector<Representative>& rRepresentatives)