Remove SparseOHArray::insert

m-holger
1 parent 73023bcb
Showing 3 changed files with 13 additions and 25 deletions
libqpdf/QPDF_Array.cc
libqpdf/SparseOHArray.cc
libqpdf/qpdf/SparseOHArray.hh
@@ -246,7 +246,19 @@ QPDF_Array::insert(int at, QPDFObjectHandle const&amp; item)
     } else {
         checkOwnership(item);
         if (sparse) {
-            sp_elements.insert(at, item);
+            auto iter = sp_elements.elements.crbegin();
+            while (iter != sp_elements.elements.crend()) {
+                auto key = (iter++)->first;
+                if (key >= at) {
+                    auto nh = sp_elements.elements.extract(key);
+                    ++nh.key();
+                    sp_elements.elements.insert(std::move(nh));
+                } else {
+                    break;
+                }
+            }
+            sp_elements.elements[at] = item.getObj();
+            ++sp_elements.n_elements;
         } else {
             elements.insert(elements.cbegin() + at, item.getObj());
         }
@@ -49,29 +49,6 @@ SparseOHArray::erase(int at)
     --n_elements;
 }
  
-void
-SparseOHArray::insert(int idx, QPDFObjectHandle oh)
-{
-    if (idx == n_elements) {
-        // Allow inserting to the last position
-        append(oh);
-    } else {
-        auto iter = elements.crbegin();
-        while (iter != elements.crend()) {
-            auto key = (iter++)->first;
-            if (key >= idx) {
-                auto nh = elements.extract(key);
-                ++nh.key();
-                elements.insert(std::move(nh));
-            } else {
-                break;
-            }
-        }
-        elements[idx] = oh.getObj();
-        ++n_elements;
-    }
-}
-
 SparseOHArray
 SparseOHArray::copy()
 {
@@ -34,7 +34,6 @@ class SparseOHArray
         elements[idx] = oh.getObj();
     }
     void erase(int idx);
-    void insert(int idx, QPDFObjectHandle oh);
     SparseOHArray copy();
     void disconnect();