diff options
| -rw-r--r-- | filter/source/pdf/impdialog.cxx | 2 | ||||
| -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/source/filter/ipdf/pdfread.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index ef802ebbf6a5..658f34b4ebb3 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -607,7 +607,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) switch( paParent->mnPDFTypeSelection ) { default: - case 0: mpCbPDFA1b->Check( false ); // PDF 1.4 + case 0: mpCbPDFA1b->Check( false ); // PDF 1.5 break; case 1: mpCbPDFA1b->Check(); // PDF/A-1a break; diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index f6e87b717178..04479fa2d9f3 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -562,7 +562,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& { default: case 0: - aContext.Version = vcl::PDFWriter::PDFVersion::PDF_1_4; + aContext.Version = vcl::PDFWriter::PDFVersion::PDF_1_5; break; case 1: aContext.Version = vcl::PDFWriter::PDFVersion::PDF_A_1; diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 0f579d52b1b7..1ff79089c64c 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -639,7 +639,7 @@ The following structure describes the permissions used in PDF security DefaultLinkAction( PDFWriter::URIAction ), ConvertOOoTargetToPDFTarget( false ), ForcePDFAction( false ), - Version( PDFWriter::PDFVersion::PDF_1_4 ), + Version( PDFWriter::PDFVersion::PDF_1_5 ), Tagged( false ), SubmitFormat( PDFWriter::FDF ), AllowDuplicateFieldNames( false ), diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index bee6890c2da8..1b1c16c3245d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5182,7 +5182,7 @@ <constraints> <enumeration oor:value="0"> <info> - <desc>PDF 1.4 (default selection).</desc> + <desc>PDF 1.5 (default selection).</desc> </info> </enumeration> <enumeration oor:value="1"> diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index 2eab3e887d6c..31d24cc89701 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -144,7 +144,7 @@ bool isCompatible(SvStream& rInStream, sal_uInt64 nPos, sal_uInt64 nSize) sal_Int32 nMajor = OString(aFirstBytes[5]).toInt32(); sal_Int32 nMinor = OString(aFirstBytes[7]).toInt32(); - return !(nMajor > 1 || (nMajor == 1 && nMinor > 4)); + return !(nMajor > 1 || (nMajor == 1 && nMinor > 5)); } /// Takes care of transparently downgrading the version of the PDF stream in @@ -159,7 +159,7 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream, sal_uInt64 n rOutStream.WriteStream(rInStream, nSize); else { - // Downconvert to PDF-1.4. + // Downconvert to PDF-1.5. FPDF_LIBRARY_CONFIG aConfig; aConfig.version = 2; aConfig.m_pUserFontPaths = nullptr; @@ -178,8 +178,8 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream, sal_uInt64 n return false; CompatibleWriter aWriter; - // 14 means PDF-1.4. - if (!FPDF_SaveWithVersion(pPdfDocument, &aWriter, 0, 14)) + // 15 means PDF-1.5. + if (!FPDF_SaveWithVersion(pPdfDocument, &aWriter, 0, 15)) return false; FPDF_CloseDocument(pPdfDocument); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index a61d26235976..a4766f502751 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1801,8 +1801,8 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal case PDFWriter::PDFVersion::PDF_1_2: aBuffer.append( "1.2" );break; case PDFWriter::PDFVersion::PDF_1_3: aBuffer.append( "1.3" );break; case PDFWriter::PDFVersion::PDF_A_1: - default: case PDFWriter::PDFVersion::PDF_1_4: aBuffer.append( "1.4" );break; + default: case PDFWriter::PDFVersion::PDF_1_5: aBuffer.append( "1.5" );break; } // append something binary as comment (suggested in PDF Reference) |