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

Introduce CreateFlag for all the ooxmlfile

Browse Source
This commit is contained in:
Debao Zhang
2014-02-27 14:07:38 +08:00
parent 12129cebdc
commit 34c645ed76
41 changed files with 140 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/propsapp/tst_docpropsapptest.cpp
+2 -2
View File
@@ -20,7 +20,7 @@ DocPropsAppTest::DocPropsAppTest()
void DocPropsAppTest::testCase1()
{
QXlsx::DocPropsApp props;
QXlsx::DocPropsApp props(QXlsx::DocPropsApp::F_NewFromScratch);
props.setProperty("company", "HMI CN");
props.setProperty("manager", "Debao");
@@ -31,7 +31,7 @@ void DocPropsAppTest::testCase1()
f1.close();
f1.open(QFile::ReadOnly);
QXlsx::DocPropsApp props2;
QXlsx::DocPropsApp props2(QXlsx::DocPropsApp::F_LoadFromExists);
props2.loadFromXmlFile(&f1);
QCOMPARE(props2.property("company"), QString("HMI CN"));
tests/auto/propscore/tst_propscoretest.cpp
+2 -2
View File
@@ -20,7 +20,7 @@ DocPropsCoreTest::DocPropsCoreTest()
void DocPropsCoreTest::testCase1()
{
QXlsx::DocPropsCore props;
QXlsx::DocPropsCore props(QXlsx::DocPropsCore::F_NewFromScratch);
props.setProperty("creator", "Debao");
props.setProperty("keywords", "Test, test, TEST");
@@ -32,7 +32,7 @@ void DocPropsCoreTest::testCase1()
f1.close();
f1.open(QFile::ReadOnly);
QXlsx::DocPropsCore props2;
QXlsx::DocPropsCore props2(QXlsx::DocPropsCore::F_LoadFromExists);
props2.loadFromXmlFile(&f1);
QCOMPARE(props2.property("creator"), QString("Debao"));
tests/auto/sharedstrings/tst_sharedstringstest.cpp
+5 -5
View File
@@ -27,7 +27,7 @@ SharedStringsTest::SharedStringsTest()
void SharedStringsTest::testAddSharedString()
{
QXlsx::SharedStrings sst;
QXlsx::SharedStrings sst(QXlsx::SharedStrings::F_NewFromScratch);
sst.addSharedString("Hello Qt!");
sst.addSharedString("Xlsx Writer");
@@ -68,7 +68,7 @@ void SharedStringsTest::testAddSharedString()
void SharedStringsTest::testRemoveSharedString()
{
QXlsx::SharedStrings sst;
QXlsx::SharedStrings sst(QXlsx::SharedStrings::F_NewFromScratch);
sst.addSharedString("Hello Qt!");
sst.addSharedString("Xlsx Writer");
sst.addSharedString("Hello World");
@@ -101,7 +101,7 @@ void SharedStringsTest::testRemoveSharedString()
void SharedStringsTest::testLoadXmlData()
{
QXlsx::SharedStrings sst;
QXlsx::SharedStrings sst(QXlsx::SharedStrings::F_NewFromScratch);
sst.addSharedString("Hello Qt!");
sst.addSharedString("Xlsx Writer");
@@ -119,7 +119,7 @@ void SharedStringsTest::testLoadXmlData()
sst.addSharedString("Hello Qt!");
QByteArray xmlData = sst.saveToXmlData();
QSharedPointer<QXlsx::SharedStrings> sst2(new QXlsx::SharedStrings);
QSharedPointer<QXlsx::SharedStrings> sst2(new QXlsx::SharedStrings(QXlsx::SharedStrings::F_LoadFromExists));
sst2->loadFromXmlData(xmlData);
QCOMPARE(sst2->getSharedString(0).toPlainString(), QStringLiteral("Hello Qt!"));
@@ -147,7 +147,7 @@ void SharedStringsTest::testLoadRichStringXmlData()
"</si>"
"</sst>";
QSharedPointer<QXlsx::SharedStrings> sst(new QXlsx::SharedStrings);
QSharedPointer<QXlsx::SharedStrings> sst(new QXlsx::SharedStrings(QXlsx::SharedStrings::F_LoadFromExists));
sst->loadFromXmlData(xmlData);
QXlsx::RichString rs = sst->getSharedString(0);
QVERIFY(rs.fragmentText(0) == "e=mc");
tests/auto/styles/tst_stylestest.cpp
+9 -9
View File
@@ -32,7 +32,7 @@ StylesTest::StylesTest()
void StylesTest::testEmptyStyle()
{
QXlsx::Styles styles;
QXlsx::Styles styles(QXlsx::Styles::F_NewFromScratch);
QByteArray xmlData = styles.saveToXmlData();
QVERIFY2(xmlData.contains("<cellXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/></cellXfs>"), "Must have one cell style");
@@ -41,7 +41,7 @@ void StylesTest::testEmptyStyle()
void StylesTest::testAddXfFormat()
{
QXlsx::Styles styles;
QXlsx::Styles styles(QXlsx::Styles::F_NewFromScratch);
for (int i=0; i<10; ++i) {
QXlsx::Format format;
@@ -55,7 +55,7 @@ void StylesTest::testAddXfFormat()
void StylesTest::testAddXfFormat2()
{
QXlsx::Styles styles;
QXlsx::Styles styles(QXlsx::Styles::F_NewFromScratch);
QXlsx::Format format;
format.setNumberFormat("h:mm:ss AM/PM"); //builtin 19
@@ -73,7 +73,7 @@ void StylesTest::testAddXfFormat2()
// For a solid fill, Excel reverses the role of foreground and background colours
void StylesTest::testSolidFillBackgroundColor()
{
QXlsx::Styles styles;
QXlsx::Styles styles(QXlsx::Styles::F_NewFromScratch);
QXlsx::Format format;
format.setPatternBackgroundColor(QColor(Qt::red));
styles.addXfFormat(format);
@@ -85,7 +85,7 @@ void StylesTest::testSolidFillBackgroundColor()
void StylesTest::testWriteBorders()
{
QXlsx::Styles styles;
QXlsx::Styles styles(QXlsx::Styles::F_NewFromScratch);
QXlsx::Format format;
format.setRightBorderStyle(QXlsx::Format::BorderThin);
styles.addXfFormat(format);
@@ -103,7 +103,7 @@ void StylesTest::testReadFonts()
"<font><sz val=\"15\"/><color rgb=\"FFff0000\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>"
"<font><b/><u val=\"double\"/><sz val=\"11\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>"
"</fonts>";
QXlsx::Styles styles(true);
QXlsx::Styles styles(QXlsx::Styles::F_LoadFromExists);
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//So current node is fonts
styles.readFonts(reader);
@@ -122,7 +122,7 @@ void StylesTest::testReadFills()
"<fill><patternFill patternType=\"lightUp\"/></fill>"
"<fill><patternFill patternType=\"solid\"><fgColor rgb=\"FFa0a0a4\"/></patternFill></fill>"
"</fills>";
QXlsx::Styles styles(true);
QXlsx::Styles styles(QXlsx::Styles::F_LoadFromExists);
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//So current node is fills
styles.readFills(reader);
@@ -139,7 +139,7 @@ void StylesTest::testReadBorders()
"<border><left style=\"dashDotDot\"><color auto=\"1\"/></left><right style=\"dashDotDot\"><color auto=\"1\"/></right><top style=\"dashDotDot\"><color auto=\"1\"/></top><bottom style=\"dashDotDot\"><color auto=\"1\"/></bottom><diagonal/></border>"
"</borders>";
QXlsx::Styles styles(true);
QXlsx::Styles styles(QXlsx::Styles::F_LoadFromExists);
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//So current node is borders
styles.readBorders(reader);
@@ -154,7 +154,7 @@ void StylesTest::testReadNumFmts()
"<numFmt numFmtId=\"165\" formatCode=\"dd/mm/yyyy\"/>"
"</numFmts>";
QXlsx::Styles styles(true);
QXlsx::Styles styles(QXlsx::Styles::F_LoadFromExists);
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//So current node is numFmts
styles.readNumFmts(reader);
tests/auto/worksheet/tst_worksheet.cpp
+14 -14
View File
@@ -42,7 +42,7 @@ WorksheetTest::WorksheetTest()
void WorksheetTest::testEmptySheet()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.write("B1", 123);
QByteArray xmldata = sheet.saveToXmlData();
@@ -51,7 +51,7 @@ void WorksheetTest::testEmptySheet()
void WorksheetTest::testDimension()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
QCOMPARE(sheet.dimension(), QXlsx::CellRange()); //Default
sheet.write("C3", "Test");
@@ -70,7 +70,7 @@ void WorksheetTest::testDimension()
void WorksheetTest::testSheetView()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.setGridLinesVisible(false);
sheet.setWindowProtected(true);
QByteArray xmldata = sheet.saveToXmlData();
@@ -81,7 +81,7 @@ void WorksheetTest::testSheetView()
void WorksheetTest::testSetColumn()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.setColumn(1, 11, 20.0); //"A:K"
sheet.setColumn(4, 8, 10.0); //"D:H"
sheet.setColumn(6, 6, 15.0); //"F:F"
@@ -100,7 +100,7 @@ void WorksheetTest::testSetColumn()
void WorksheetTest::testWriteCells()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.write("A1", 123);
sheet.write("A2", "Hello");
sheet.writeInlineString(3, 1, "Hello inline"); //A3
@@ -122,7 +122,7 @@ void WorksheetTest::testWriteCells()
void WorksheetTest::testWriteHyperlinks()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.write("A1", QUrl::fromUserInput("http://qt-project.org"));
sheet.write("B1", QUrl::fromUserInput("http://qt-project.org/abc"));
sheet.write("C1", QUrl::fromUserInput("http://qt-project.org/abc.html#test"));
@@ -146,7 +146,7 @@ void WorksheetTest::testWriteHyperlinks()
void WorksheetTest::testWriteDataValidations()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
QXlsx::DataValidation validation(QXlsx::DataValidation::Whole);
validation.setFormula1("10");
validation.setFormula2("100");
@@ -160,7 +160,7 @@ void WorksheetTest::testWriteDataValidations()
void WorksheetTest::testMerge()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.write("B1", 123);
sheet.mergeCells("B1:B5");
QByteArray xmldata = sheet.saveToXmlData();
@@ -170,7 +170,7 @@ void WorksheetTest::testMerge()
void WorksheetTest::testUnMerge()
{
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_NewFromScratch);
sheet.write("B1", 123);
sheet.mergeCells("B1:B5");
sheet.unmergeCells("B1:B5");
@@ -197,7 +197,7 @@ void WorksheetTest::testReadSheetData()
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//current node is sheetData
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_LoadFromExists);
sheet.d_func()->sharedStrings()->addSharedString("Hello");
sheet.d_func()->loadXmlSheetData(reader);
@@ -238,7 +238,7 @@ void WorksheetTest::testReadColsInfo()
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//current node is cols
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_LoadFromExists);
sheet.d_func()->loadXmlColumnsInfo(reader);
QCOMPARE(sheet.d_func()->colsInfo.size(), 1);
@@ -258,7 +258,7 @@ void WorksheetTest::testReadRowsInfo()
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//current node is sheetData
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_LoadFromExists);
sheet.d_func()->loadXmlSheetData(reader);
QCOMPARE(sheet.d_func()->rowsInfo.size(), 1);
@@ -272,7 +272,7 @@ void WorksheetTest::testReadMergeCells()
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//current node is mergeCells
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_LoadFromExists);
sheet.d_func()->loadXmlMergeCells(reader);
QCOMPARE(sheet.d_func()->merges.size(), 2);
@@ -289,7 +289,7 @@ void WorksheetTest::testReadDataValidations()
QXmlStreamReader reader(xmlData);
reader.readNextStartElement();//current node is dataValidations
QXlsx::Worksheet sheet("", 1, 0);
QXlsx::Worksheet sheet("", 1, 0, QXlsx::Worksheet::F_LoadFromExists);
sheet.d_func()->loadXmlDataValidations(reader);
QCOMPARE(sheet.d_func()->dataValidationsList.size(), 2);