mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
mathed35.diff
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1580 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
351c0e0e59
commit
ff1cc2223d
@ -219,9 +219,9 @@ void MathedArray::insert(MathedArray::iterator pos,
|
||||
last_ = bf_.size() - 1;
|
||||
}
|
||||
#else
|
||||
void MathedArray::mergeF(MathedArray * a, int p, int dx)
|
||||
void MathedArray::merge(MathedArray const & a, int p)
|
||||
{
|
||||
my_memcpy(&bf_[p], &a->bf_[0], dx);
|
||||
my_memcpy(&bf_[p], &a.bf_[0], a.last());
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -84,7 +84,7 @@ public:
|
||||
#else
|
||||
/// Merge \a dx elements from array \a a at \apos.
|
||||
/// This doesn't changes the size (dangerous)
|
||||
void mergeF(MathedArray * a, int pos, int dx);
|
||||
void merge(MathedArray const & a, int pos);
|
||||
#endif
|
||||
///
|
||||
void raw_pointer_copy(MathedInset ** p, int pos) const;
|
||||
|
@ -844,7 +844,7 @@ bool MathedCursor::pullArg()
|
||||
p->clear();
|
||||
Delete();
|
||||
if (!a.empty()) {
|
||||
cursor->Merge(&a);
|
||||
cursor->Merge(a);
|
||||
cursor->Adjust();
|
||||
}
|
||||
|
||||
@ -947,7 +947,7 @@ void MathedCursor::SelPaste()
|
||||
SelDel();
|
||||
|
||||
if (!selarray.empty()) {
|
||||
cursor->Merge(&selarray);
|
||||
cursor->Merge(selarray);
|
||||
cursor->Adjust();
|
||||
}
|
||||
}
|
||||
|
@ -139,27 +139,18 @@ void MathedXIter::Clean(int pos2)
|
||||
}
|
||||
|
||||
|
||||
void MathedXIter::Merge(MathedArray * a0)
|
||||
void MathedXIter::Merge(MathedArray const & a)
|
||||
{
|
||||
if (!a0) {
|
||||
lyxerr[Debug::MATHED]
|
||||
<< "Math error: Attempting to merge a void array." << endl;
|
||||
|
||||
return;
|
||||
}
|
||||
// All insets must be clonned
|
||||
MathedArray * a = new MathedArray(*a0);
|
||||
|
||||
#if 0
|
||||
array->insert(array->begin() + pos,
|
||||
a->begin(), a->end());
|
||||
a.begin(), a.end());
|
||||
#else
|
||||
// make room for the data
|
||||
split(a->last());
|
||||
array->mergeF(a, pos, a->last());
|
||||
split(a.last());
|
||||
array->merge(a, pos);
|
||||
#endif
|
||||
int pos1 = pos;
|
||||
int pos2 = pos + a->last();
|
||||
int pos2 = pos + a.last();
|
||||
|
||||
goPosAbs(pos1);
|
||||
|
||||
@ -186,8 +177,6 @@ void MathedXIter::Merge(MathedArray * a0)
|
||||
goPosAbs(pos1);
|
||||
checkTabs();
|
||||
goPosAbs(pos2);
|
||||
|
||||
delete a;
|
||||
}
|
||||
|
||||
|
||||
|
@ -71,7 +71,7 @@ public:
|
||||
///
|
||||
void setTab(int, int);
|
||||
/// Merge the array at current position
|
||||
void Merge(MathedArray *);
|
||||
void Merge(MathedArray const &);
|
||||
/// Delete every object from current position to pos2
|
||||
void Clean(int pos2);
|
||||
///
|
||||
|
Loading…
Reference in New Issue
Block a user