diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 13:27:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-07 07:56:49 +0100 |
| commit | 83241dba8fbf2004c48d87cb7221fd354589b28c (patch) | |
| tree | c7f94b07d2c4cf2a5f49c1372c2970424ac7b2ea /sc/source/filter/excel/xilink.cxx | |
| parent | 2e2d736ccbb21daae91603732c87d5375ede1b47 (diff) | |
loplugin:collapseif in sc
Change-Id: I06bcf6b33af5c6eddb614f1f0ce1b2713876b162
Reviewed-on: https://gerrit.libreoffice.org/62954
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/excel/xilink.cxx')
| -rw-r--r-- | sc/source/filter/excel/xilink.cxx | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index d34237115622..23757998a0f9 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -378,23 +378,20 @@ XclImpExtName::XclImpExtName( XclImpSupbook& rSupbook, XclImpStream& rStrm, XclS case xlExtName: // TODO: For now, only global external names are supported. In future // we should extend this to supporting per-sheet external names. - if (mnStorageId == 0) + if (mnStorageId == 0 && pFormulaConv) { - if (pFormulaConv) - { - std::unique_ptr<ScTokenArray> pArray; - sal_uInt16 nFmlaLen; - nFmlaLen = rStrm.ReaduInt16(); - std::vector<OUString> aTabNames; - sal_uInt16 nCount = rSupbook.GetTabCount(); - aTabNames.reserve(nCount); - for (sal_uInt16 i = 0; i < nCount; ++i) - aTabNames.push_back(rSupbook.GetTabName(i)); - - pFormulaConv->ConvertExternName(pArray, rStrm, nFmlaLen, rSupbook.GetXclUrl(), aTabNames); - if (pArray) - mxArray = std::move( pArray ); - } + std::unique_ptr<ScTokenArray> pArray; + sal_uInt16 nFmlaLen; + nFmlaLen = rStrm.ReaduInt16(); + std::vector<OUString> aTabNames; + sal_uInt16 nCount = rSupbook.GetTabCount(); + aTabNames.reserve(nCount); + for (sal_uInt16 i = 0; i < nCount; ++i) + aTabNames.push_back(rSupbook.GetTabName(i)); + + pFormulaConv->ConvertExternName(pArray, rStrm, nFmlaLen, rSupbook.GetXclUrl(), aTabNames); + if (pArray) + mxArray = std::move( pArray ); } break; case xlExtOLE: |