Commit 496ca2e4dca0d752823972e058e4885ec3b9004e

Authored by Jay Berkenbilt
1 parent 6df62607

Remove QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage

include/qpdf/QPDFAcroFormDocumentHelper.hh
@@ -248,19 +248,6 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper @@ -248,19 +248,6 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper
248 QPDFAcroFormDocumentHelper& from_afdh, 248 QPDFAcroFormDocumentHelper& from_afdh,
249 std::set<QPDFObjGen>* new_fields = nullptr); 249 std::set<QPDFObjGen>* new_fields = nullptr);
250 250
251 - // copyFieldsFromForeignPage was added in qpdf 10.2 and made to do  
252 - // nothing in 10.3. It wasn't actually doing the right thing and  
253 - // would result in broken files in all but the simplest case of a  
254 - // single page from one file being added to another file, as  
255 - // happens with qpdf --split-pages.  
256 - [[deprecated("Use fixCopiedAnnotations instead")]]  
257 - // ABI: delete this method  
258 - QPDF_DLL void  
259 - copyFieldsFromForeignPage(  
260 - QPDFPageObjectHelper foreign_page,  
261 - QPDFAcroFormDocumentHelper& foreign_afdh,  
262 - std::vector<QPDFObjectHandle>* copied_fields = nullptr);  
263 -  
264 private: 251 private:
265 void analyze(); 252 void analyze();
266 void traverseField( 253 void traverseField(
libqpdf/QPDFAcroFormDocumentHelper.cc
@@ -1144,21 +1144,6 @@ QPDFAcroFormDocumentHelper::transformAnnotations( @@ -1144,21 +1144,6 @@ QPDFAcroFormDocumentHelper::transformAnnotations(
1144 } 1144 }
1145 1145
1146 void 1146 void
1147 -QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage(  
1148 - QPDFPageObjectHelper foreign_page,  
1149 - QPDFAcroFormDocumentHelper& foreign_afdh,  
1150 - std::vector<QPDFObjectHandle>* copied_fields)  
1151 -{  
1152 - this->qpdf.warn(QPDFExc(  
1153 - qpdf_e_unsupported,  
1154 - "",  
1155 - "",  
1156 - 0,  
1157 - "Non-working version of copyFieldsFromForeignPage"  
1158 - " from qpdf 10.2 called; application requires updating"));  
1159 -}  
1160 -  
1161 -void  
1162 QPDFAcroFormDocumentHelper::fixCopiedAnnotations( 1147 QPDFAcroFormDocumentHelper::fixCopiedAnnotations(
1163 QPDFObjectHandle to_page, 1148 QPDFObjectHandle to_page,
1164 QPDFObjectHandle from_page, 1149 QPDFObjectHandle from_page,
manual/release-notes.rst
@@ -64,6 +64,11 @@ For a detailed list of changes, please see the file @@ -64,6 +64,11 @@ For a detailed list of changes, please see the file
64 64
65 - API: breaking changes 65 - API: breaking changes
66 66
  67 + - Remove
  68 + ``QPDFAcroFormDocumentHelper::copyFieldsFromForeignPage``. This
  69 + method never worked and only did something in qpdf version
  70 + 10.2.x.
  71 +
67 - Other changes 72 - Other changes
68 73
69 - A new chapter on contributing to qpdf has been added to the 74 - A new chapter on contributing to qpdf has been added to the