Update deprecated KArchive method + remove unused variable in

generator_pdf

Reviewer: sandsmark
This commit is contained in:
Olivier CHURLAUD 2016-07-13 20:58:30 +02:00
parent c110c65401
commit ec0b68a756
2 changed files with 5 additions and 2 deletions

View file

@ -4583,8 +4583,10 @@ bool Document::saveDocumentArchive( const QString &fileName )
return false;
const QByteArray contentDocXml = contentDoc.toByteArray();
okularArchive.writeFile( QStringLiteral("content.xml"), user.loginName(), userGroup.name(),
contentDocXml.constData(), contentDocXml.length() );
const mode_t perm = 0100644;
okularArchive.writeFile( QStringLiteral("content.xml"), contentDocXml, perm,
user.loginName(), userGroup.name() );
okularArchive.addLocalFile( docPath, docFileName );
okularArchive.addLocalFile( metadataFile.fileName(), QStringLiteral("metadata.xml") );

View file

@ -1773,6 +1773,7 @@ bool PDFGenerator::supportsOption( SaveOption option ) const
bool PDFGenerator::save( const QString &fileName, SaveOptions options, QString *errorText )
{
Q_UNUSED(errorText);
Poppler::PDFConverter *pdfConv = pdfdoc->pdfConverter();
pdfConv->setOutputFileName( fileName );