diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-03-07 10:44:45 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-03-08 10:38:24 +0000 |
| commit | e624e07cc54c408bb86bd2e52cfed3c7ec59fb4a (patch) | |
| tree | b64c50973750ec5aceb3f217a577fb149b70cb41 | |
| parent | 7a907965cc6246ab644be92811e35d9f73a90e86 (diff) | |
vcl: PDF export: default to PDF 1.7
Released by Adobe in 2006, and standardized as ISO 32000-1:2008.
Change-Id: I22c89019905c90e10fefb752c210ec7ea81b725b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148388
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | filter/source/pdf/pdfexport.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/pdfwriter.hxx | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 | ||||
| -rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index b966bf4bde95..9074a345f809 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -670,7 +670,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { default: case 0: - aContext.Version = vcl::PDFWriter::PDFVersion::PDF_1_6; + aContext.Version = vcl::PDFWriter::PDFVersion::PDF_1_7; break; case 1: aContext.Version = vcl::PDFWriter::PDFVersion::PDF_A_1; diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 1e21fae1c5bd..bbb2d861fe56 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -641,7 +641,7 @@ The following structure describes the permissions used in PDF security DefaultLinkAction( PDFWriter::URIAction ), ConvertOOoTargetToPDFTarget( false ), ForcePDFAction( false ), - Version( PDFWriter::PDFVersion::PDF_1_6 ), + Version(PDFWriter::PDFVersion::PDF_1_7), UniversalAccessibilityCompliance( false ), Tagged( false ), SubmitFormat( PDFWriter::FDF ), diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 9ae5b9117f45..0332feaeef07 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5446,7 +5446,7 @@ <constraints> <enumeration oor:value="0"> <info> - <desc>PDF 1.6 (default selection).</desc> + <desc>PDF 1.7 (default selection).</desc> </info> </enumeration> <enumeration oor:value="15"> diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 30d9b5513c97..37b4c1feece0 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -2478,7 +2478,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testDefaultVersion) // Parse the export result. std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); int nFileVersion = pPdfDocument->getFileVersion(); - CPPUNIT_ASSERT_EQUAL(16, nFileVersion); + CPPUNIT_ASSERT_EQUAL(17, nFileVersion); } CPPUNIT_TEST_FIXTURE(PdfExportTest, testVersion15) diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index a841842a6942..cbc0c20bc21f 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1300,8 +1300,8 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, case PDFWriter::PDFVersion::PDF_A_1: case PDFWriter::PDFVersion::PDF_1_4: aBuffer.append( "1.4" );break; case PDFWriter::PDFVersion::PDF_1_5: aBuffer.append( "1.5" );break; - default: case PDFWriter::PDFVersion::PDF_1_6: aBuffer.append( "1.6" );break; + default: case PDFWriter::PDFVersion::PDF_A_2: case PDFWriter::PDFVersion::PDF_A_3: case PDFWriter::PDFVersion::PDF_1_7: aBuffer.append( "1.7" );break; |