diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-04-16 19:11:37 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-04-16 19:12:07 +0200 |
| commit | 496ca2e4dca0d752823972e058e4885ec3b9004e (patch) | |
| tree | cfe68bebf8f9f2578cc2352fdf071ad74682ffa9 | |
| parent | 6df62607515cd10bef7634cee1580ad1fc3d542d (diff) | |
| download | qpdf-496ca2e4dca0d752823972e058e4885ec3b9004e.tar.zst | |
Remove QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage
| -rw-r--r-- | include/qpdf/QPDFAcroFormDocumentHelper.hh | 13 | ||||
| -rw-r--r-- | libqpdf/QPDFAcroFormDocumentHelper.cc | 15 | ||||
| -rw-r--r-- | manual/release-notes.rst | 5 |
3 files changed, 5 insertions, 28 deletions
diff --git a/include/qpdf/QPDFAcroFormDocumentHelper.hh b/include/qpdf/QPDFAcroFormDocumentHelper.hh index 690aecfd..3c4f1ca3 100644 --- a/include/qpdf/QPDFAcroFormDocumentHelper.hh +++ b/include/qpdf/QPDFAcroFormDocumentHelper.hh @@ -248,19 +248,6 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper QPDFAcroFormDocumentHelper& from_afdh, std::set<QPDFObjGen>* new_fields = nullptr); - // copyFieldsFromForeignPage was added in qpdf 10.2 and made to do - // nothing in 10.3. It wasn't actually doing the right thing and - // would result in broken files in all but the simplest case of a - // single page from one file being added to another file, as - // happens with qpdf --split-pages. - [[deprecated("Use fixCopiedAnnotations instead")]] - // ABI: delete this method - QPDF_DLL void - copyFieldsFromForeignPage( - QPDFPageObjectHelper foreign_page, - QPDFAcroFormDocumentHelper& foreign_afdh, - std::vector<QPDFObjectHandle>* copied_fields = nullptr); - private: void analyze(); void traverseField( diff --git a/libqpdf/QPDFAcroFormDocumentHelper.cc b/libqpdf/QPDFAcroFormDocumentHelper.cc index 435cd4f6..0354a28f 100644 --- a/libqpdf/QPDFAcroFormDocumentHelper.cc +++ b/libqpdf/QPDFAcroFormDocumentHelper.cc @@ -1144,21 +1144,6 @@ QPDFAcroFormDocumentHelper::transformAnnotations( } void -QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage( - QPDFPageObjectHelper foreign_page, - QPDFAcroFormDocumentHelper& foreign_afdh, - std::vector<QPDFObjectHandle>* copied_fields) -{ - this->qpdf.warn(QPDFExc( - qpdf_e_unsupported, - "", - "", - 0, - "Non-working version of copyFieldsFromForeignPage" - " from qpdf 10.2 called; application requires updating")); -} - -void QPDFAcroFormDocumentHelper::fixCopiedAnnotations( QPDFObjectHandle to_page, QPDFObjectHandle from_page, diff --git a/manual/release-notes.rst b/manual/release-notes.rst index 8a8c6058..c48fd15a 100644 --- a/manual/release-notes.rst +++ b/manual/release-notes.rst @@ -64,6 +64,11 @@ For a detailed list of changes, please see the file - API: breaking changes + - Remove + ``QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage``. This + method never worked and only did something in qpdf version + 10.2.x. + - Other changes - A new chapter on contributing to qpdf has been added to the |