mathed58.diff

[lyx.git] / src / mathed / array.C

diff --git a/src/mathed/array.C b/src/mathed/array.C
index 9004200de8010b4f5c49bb600baabf4780a2cd38..bc5b02596d7fb8a7704f6c016ce97a8cbc988018 100644 (file)
--- a/src/mathed/array.C
+++ b/src/mathed/array.C
@@ -14,7 +14,6 @@
 using std::ostream;
 using std::endl;
 
-// Is this still needed? (Lgb)
 static inline
 void * my_memcpy(void * ps_in, void const * pt_in, size_t n)
 {
@@ -60,13 +59,17 @@ MathedArray::MathedArray(MathedArray const & array)
        last_ = array.last_;
 
        // deep copy
-       // we'll not yet get exeption safety
+       deep_copy();
+}
+
+void MathedArray::deep_copy()
+{
        MathedIter it(this);
        while (it.OK()) {
                if (it.IsInset()) {
                        MathedInset * inset = it.GetInset();
                        inset = inset->Clone();
-                       raw_pointer_insert(inset, it.getPos() + 1, sizeof(inset));
+                       raw_pointer_insert(inset, it.getPos() + 1);
                }
                it.Next();
        }
@@ -200,18 +203,8 @@ void MathedArray::shrink(int pos1, int pos2)
        a.last(dx);
        a[dx] = '\0';
 
-       MathedIter it(&a);
-       it.Reset();
-
-       while (it.OK()) {
-               if (it.IsInset()) {
-                       MathedInset * inset = it.GetInset();
-                       inset = inset->Clone();
-                       a.raw_pointer_insert(inset, it.getPos() + 1, sizeof(inset));
-               }
-               it.Next();
-       }
        swap(a);
+       deep_copy();
 }
 
 
@@ -261,9 +254,9 @@ MathedInset * MathedArray::getInset(int pos)
 }
 
 #else
-void MathedArray::raw_pointer_insert(void * p, int pos, int len)
+void MathedArray::raw_pointer_insert(void * p, int pos)
 {
-       my_memcpy(&bf_[pos], &p, len);
+       my_memcpy(&bf_[pos], &p, sizeof(p));
 }
 #endif