TianZD/QtXlsxWriter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure that at least one worksheet exist in the workbook

Browse Source
This commit is contained in:
Debao Zhang
2014-01-02 11:45:02 +08:00
parent c6898ff732
commit 5866e1342c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworkbook.cpp
+2
View File
@@ -251,6 +251,8 @@ bool Workbook::renameWorksheet(int index, const QString &name)
bool Workbook::deleteWorksheet(int index) bool Workbook::deleteWorksheet(int index)
{ {
Q_D(Workbook); Q_D(Workbook);
if (d->worksheets.size() <= 1)
return false;
if (index < 0 || index >= d->worksheets.size()) if (index < 0 || index >= d->worksheets.size())
return false; return false;
d->worksheets.removeAt(index); d->worksheets.removeAt(index);
tests/auto/document/tst_documenttest.cpp
+4 -2
View File
@@ -343,8 +343,10 @@ void DocumentTest::testDeleteWorksheet()
QCOMPARE(xlsx1.worksheetNames(), QStringList()<<"Sheet1"<<"Sheet3"); QCOMPARE(xlsx1.worksheetNames(), QStringList()<<"Sheet1"<<"Sheet3");
xlsx1.deleteWorksheet("Sheet1"); xlsx1.deleteWorksheet("Sheet1");
QCOMPARE(xlsx1.worksheetNames(), QStringList()<<"Sheet3"); QCOMPARE(xlsx1.worksheetNames(), QStringList()<<"Sheet3");
// xlsx1.deleteWorksheet("Sheet3");
// QCOMPARE(xlsx1.worksheetNames(), QStringList()<<"Sheet4"); //Cann't delete the last worksheet
xlsx1.deleteWorksheet("Sheet3");
QCOMPARE(xlsx1.worksheetNames(), QStringList()<<"Sheet3");
} }
QTEST_APPLESS_MAIN(DocumentTest) QTEST_APPLESS_MAIN(DocumentTest)