Browse Source

Fix warning: unused variable

master
Debao Zhang 11 years ago
parent
commit
68b44ce2ad
  1. 2
      src/xlsx/xlsxdocument.cpp
  2. 1
      src/xlsx/xlsxpackage.cpp
  3. 1
      src/xlsx/xlsxstyles.cpp
  4. 3
      src/xlsx/xlsxworkbook.cpp
  5. 5
      src/xlsx/xlsxworksheet.cpp

2
src/xlsx/xlsxdocument.cpp

@ -351,8 +351,6 @@ bool Document::saveAs(const QString &name)
*/
bool Document::saveAs(QIODevice *device)
{
Q_D(Document);
// activedWorksheet()->setHidden(false);
// activedWorksheet()->setSelected(true);

1
src/xlsx/xlsxpackage.cpp

@ -268,6 +268,7 @@ void Package::writeContentTypesFile(ZipWriter &zipWriter)
int drawing_index = 1;
foreach (Drawing *drawing, m_workbook->drawings()) {
Q_UNUSED(drawing);
content.addDrawingName(QStringLiteral("drawing%1").arg(drawing_index));
drawing_index += 1;
}

1
src/xlsx/xlsxstyles.cpp

@ -527,6 +527,7 @@ void Styles::writeDxfs(XmlStreamWriter &writer)
writer.writeAttribute(QStringLiteral("count"), QString::number(m_dxf_formatsList.size()));
foreach (Format *format, m_dxf_formatsList) {
writer.writeStartElement(QStringLiteral("dxf"));
Q_UNUSED(format)
writer.writeEndElement();//dxf
}
writer.writeEndElement(); //dxfs

3
src/xlsx/xlsxworkbook.cpp

@ -126,7 +126,8 @@ void Workbook::setDefaultDateFormat(const QString &format)
void Workbook::defineName(const QString &name, const QString &formula)
{
Q_UNUSED(name);
Q_UNUSED(formula);
}
Worksheet *Workbook::addWorksheet(const QString &name)

5
src/xlsx/xlsxworksheet.cpp

@ -536,7 +536,6 @@ int Worksheet::insertImage(int row, int column, const QImage &image, const QPoin
int Worksheet::mergeCells(const QString &range)
{
Q_D(Worksheet);
QStringList cells = range.split(QLatin1Char(':'));
if (cells.size() != 2)
return -1;
@ -572,7 +571,6 @@ int Worksheet::mergeCells(int row_begin, int column_begin, int row_end, int colu
int Worksheet::unmergeCells(const QString &range)
{
Q_D(Worksheet);
QStringList cells = range.split(QLatin1Char(':'));
if (cells.size() != 2)
return -1;
@ -1309,6 +1307,9 @@ void WorksheetPrivate::readMergeCells(XmlStreamReader &reader)
}
}
}
if (merges.size() != count)
qDebug("read merge cells error");
}
bool Worksheet::loadFromXmlFile(QIODevice *device)

Loading…
Cancel
Save