Browse Source

Return false when save() failed

master
Debao Zhang 11 years ago
parent
commit
b80286d7b7
  1. 2
      src/xlsx/xlsxpackage.cpp
  2. 4
      src/xlsx/xlsxworkbook.cpp
  3. 2
      src/xlsx/xlsxworkbook.h
  4. 5
      src/xlsx/xlsxzipwriter.cpp
  5. 1
      src/xlsx/xlsxzipwriter_p.h

2
src/xlsx/xlsxpackage.cpp

@ -88,6 +88,8 @@ Package::Package(Workbook *workbook) :
bool Package::createPackage(const QString &packageName)
{
ZipWriter zipWriter(packageName);
if (zipWriter.error())
return false;
m_workbook->styles()->clearExtraFormatInfo(); //These info will be generated when write the worksheet data.
writeWorksheetFiles(zipWriter);

4
src/xlsx/xlsxworkbook.cpp

@ -62,7 +62,7 @@ Workbook::~Workbook()
delete d_ptr;
}
void Workbook::save(const QString &name)
bool Workbook::save(const QString &name)
{
Q_D(Workbook);
@ -79,7 +79,7 @@ void Workbook::save(const QString &name)
//Create the package based on current workbook
Package package(this);
package.createPackage(name);
return package.createPackage(name);
}
bool Workbook::isDate1904() const

2
src/xlsx/xlsxworkbook.h

@ -61,7 +61,7 @@ public:
bool isStringsToNumbersEnabled() const;
void setStringsToNumbersEnabled(bool enable=true);
void save(const QString &name);
bool save(const QString &name);
private:
friend class Package;

5
src/xlsx/xlsxzipwriter.cpp

@ -40,6 +40,11 @@ ZipWriter::~ZipWriter()
delete m_writer;
}
bool ZipWriter::error() const
{
return m_writer->status() != QZipWriter::NoError;
}
void ZipWriter::addFile(const QString &filePath, QIODevice *device)
{
m_writer->addFile(filePath, device);

1
src/xlsx/xlsxzipwriter_p.h

@ -40,6 +40,7 @@ public:
void addFile(const QString &filePath, QIODevice *device);
void addFile(const QString &filePath, const QByteArray &data);
bool error() const;
void close();
private:

Loading…
Cancel
Save