tdf#138741 XLSX export: fix crash in setSkipUnusedFileIds
Changed size of maConvertFileIdToUsedFileId vector to the same as
maSrcFiles size.
Some external references was not inserted into maRefCells,
that resulted a smaller maConvertFileIdToUsedFileId as was needed.
This crash was caused by:
tdf#87973 XLSX export: fix lost file names in modified links
f85d860ccbebd99bc128218148e2992c9415f221
Co-authored-by: Tibor Nagy (NISZ)
Change-Id: I1501f5222483bf3e9e41c9e921a024320231dce8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107434
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 8cfe270258d914e154b9db8b6ad02cd923984435)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107481
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git a/sc/qa/unit/data/xlsx/tdf138741_externalLinkSkipUnusedsCrash.xlsx b/sc/qa/unit/data/xlsx/tdf138741_externalLinkSkipUnusedsCrash.xlsx
new file mode 100644
index 0000000..59102f2
--- /dev/null
+++ b/sc/qa/unit/data/xlsx/tdf138741_externalLinkSkipUnusedsCrash.xlsx
Binary files differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index ba5764e..03d63ba 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -271,6 +271,7 @@ public:
void testTdf126305_DataValidatyErrorAlert();
void testTdf76047_externalLink();
void testTdf87973_externalLinkSkipUnuseds();
void testTdf138741_externalLinkSkipUnusedsCrash();
void testTdf129969();
void testTdf84874();
void testTdf136721_paper_size();
@@ -443,6 +444,7 @@ public:
CPPUNIT_TEST(testTdf126305_DataValidatyErrorAlert);
CPPUNIT_TEST(testTdf76047_externalLink);
CPPUNIT_TEST(testTdf87973_externalLinkSkipUnuseds);
CPPUNIT_TEST(testTdf138741_externalLinkSkipUnusedsCrash);
CPPUNIT_TEST(testTdf129969);
CPPUNIT_TEST(testTdf84874);
CPPUNIT_TEST(testTdf136721_paper_size);
@@ -5580,6 +5582,17 @@ void ScExportTest::testTdf87973_externalLinkSkipUnuseds()
pDocSh->DoClose();
}
void ScExportTest::testTdf138741_externalLinkSkipUnusedsCrash()
{
ScDocShellRef xShell = loadDoc("tdf138741_externalLinkSkipUnusedsCrash.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell);
//without the fix in place, it would have crashed at export time
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
xShell->DoClose();
}
void ScExportTest::testTdf129969()
{
ScDocShellRef xShell = loadDoc("external_hyperlink.", FORMAT_ODS);
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 69037d4..affc984 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2084,6 +2084,8 @@ void XclExpSupbookBuffer::SaveXml( XclExpXmlStream& rStrm )
for (size_t nPos = 0, nSize = maSupbookList.GetSize(); nPos < nSize; ++nPos)
{
XclExpSupbookRef xRef(maSupbookList.GetRecord(nPos));
// fileIDs are indexed from 1 in xlsx, and from 0 in ScExternalRefManager
// converting between them require a -1 or +1
if (xRef->GetType() == XclSupbookType::Extern)
aExternFileIds.push_back(xRef->GetFileId() - 1);
}
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 9427536..9bb744b 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2751,7 +2751,7 @@ sal_uInt16 ScExternalRefManager::convertFileIdToUsedFileId(sal_uInt16 nFileId)
void ScExternalRefManager::setSkipUnusedFileIds(std::vector<sal_uInt16>& rExternFileIds)
{
mbSkipUnusedFileIds = true;
maConvertFileIdToUsedFileId.resize(maRefCells.size());
maConvertFileIdToUsedFileId.resize(maSrcFiles.size());
std::fill(maConvertFileIdToUsedFileId.begin(), maConvertFileIdToUsedFileId.end(), 0);
int nUsedCount = 0;
for (auto nEntry : rExternFileIds)
