Refactor QPDF_Array::disconnect

m-holger
1 parent 0aae54d3
Showing 4 changed files with 9 additions and 15 deletions
include/qpdf/QPDFObjectHandle.hh
libqpdf/QPDF_Array.cc
libqpdf/SparseOHArray.cc
libqpdf/qpdf/SparseOHArray.hh
@@ -1494,10 +1494,8 @@ class QPDFObjectHandle
     // disconnected().
     class DisconnectAccess
     {
-        friend class QPDF_Array;
         friend class QPDF_Dictionary;
         friend class QPDF_Stream;
-        friend class SparseOHArray;
       private:
         static void
@@ -116,11 +116,16 @@ void
 QPDF_Array::disconnect()
 {
     if (sparse) {
-        sp_elements.disconnect();
+        for (auto& item: sp_elements.elements) {
+            auto& obj = item.second;
+            if (!obj->getObjGen().isIndirect()) {
+                obj->disconnect();
+            }
+        }
     } else {
-        for (auto const& iter: elements) {
-            if (iter) {
-                QPDFObjectHandle::DisconnectAccess::disconnect(iter);
+        for (auto& obj: elements) {
+            if (!obj->getObjGen().isIndirect()) {
+                obj->disconnect();
             }
         }
     }
 #include <qpdf/SparseOHArray.hh>
-void
-SparseOHArray::disconnect()
-{
-    for (auto& iter: this->elements) {
-        QPDFObjectHandle::DisconnectAccess::disconnect(iter.second);
-    }
-}
-
 SparseOHArray
 SparseOHArray::copy()
 {
@@ -17,7 +17,6 @@ class SparseOHArray
         return n_elements;
     }
     SparseOHArray copy();
-    void disconnect();
   private:
     friend class QPDF_Array;