diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-16 12:41:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-17 09:53:55 +0200 |
| commit | 36e1834c9893deae9a45cd2026eb7d02e6a16bd9 (patch) | |
| tree | 0673088d9d7dcd7655079476576965f5f4c403c3 /sc | |
| parent | 996ded6b42c924124f279a20a10a67754df80a8a (diff) | |
cid#1509241 rearrange to silence Dereference after null check
Change-Id: I1dc444d312a2075079ad90cdf917b1eaabdaff9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138396
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 1d2d7a40a01d..b8737d663d97 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -476,18 +476,15 @@ void ScXMLChangeTrackingImportHelper::CreateGeneratedActions(std::vector<ScMyGen { for (ScMyGenerated & rGenerated : rList) { - if (rGenerated.nID == 0) - { - ScCellValue aCell; - if (rGenerated.pCellInfo) - aCell = rGenerated.pCellInfo->CreateCell(rDoc); - - if (!aCell.isEmpty()) - { - rGenerated.nID = pTrack->AddLoadedGenerated(aCell, rGenerated.aBigRange, rGenerated.pCellInfo->sInputString); - OSL_ENSURE(rGenerated.nID, "could not insert generated action"); - } - } + if (rGenerated.nID != 0) + continue; + if (!rGenerated.pCellInfo) + continue; + ScCellValue aCell = rGenerated.pCellInfo->CreateCell(rDoc); + if (aCell.isEmpty()) + continue; + rGenerated.nID = pTrack->AddLoadedGenerated(aCell, rGenerated.aBigRange, rGenerated.pCellInfo->sInputString); + OSL_ENSURE(rGenerated.nID, "could not insert generated action"); } } |