anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mathed32.diff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1570 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-02-20 14:00:34 +00:00
parent 1b0943f20d
commit 7511cc189e
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mathed/ChangeLog
View File

@ -6,6 +6,8 @@
* move MathIter::Copy(int, int) to MathArray::shrink(pos, pos)
* several files: subsequent changes
* math_cursor.C: make selarray a proper MathArray
2001-02-19 Dekel Tsur <dekelts@tau.ac.il>

23
src/mathed/math_cursor.C
View File

@ -42,7 +42,7 @@
#include "math_accentinset.h"
#include "mathed/support.h"
static MathedArray * selarray = 0;
static MathedArray selarray;
using std::endl;
@ -130,7 +130,6 @@ MathedCursor::MathedCursor(MathParInset * p) // : par(p)
anchor = 0;
lastcode = LM_TC_MIN;
SetPar(p);
// selarray = 0;
if (!MathMacroTable::built)
MathMacroTable::mathMTable.builtinMacros();
}
@ -510,7 +509,7 @@ void MathedCursor::insertInset(MathedInset * p, int t)
if (selection) {
if (MathIsActive(t)) {
SelCut();
static_cast<MathParInset*>(p)->setData(selarray);
static_cast<MathParInset*>(p)->setData(&selarray);
} else
SelDel();
}
@ -845,8 +844,10 @@ bool MathedCursor::pullArg()
MathedArray * a = p->GetData();
p->clear();
Delete();
cursor->Merge(a);
cursor->Adjust();
if (!a->empty()) {
cursor->Merge(a);
cursor->Adjust();
}
return true;
}
@ -902,8 +903,8 @@ void MathedCursor::SelCopy()
int p1 = (cursor->getPos() < selpos) ? cursor->getPos() : selpos;
int p2 = (cursor->getPos() > selpos) ?
cursor->getPos() : selpos;
selarray = new MathedArray(*(cursor->GetData()));
selarray->shrink(p1, p2);
selarray = *(cursor->GetData());
selarray.shrink(p1, p2);
cursor->Adjust();
SelClear();
}
@ -918,8 +919,8 @@ void MathedCursor::SelCut()
int p1 = (cursor->getPos() < selpos) ? cursor->getPos() : selpos;
int p2 = (cursor->getPos() > selpos) ? cursor->getPos() : selpos;
selarray = new MathedArray(*(cursor->GetData()));
selarray->shrink(p1, p2);
selarray = *(cursor->GetData());
selarray.shrink(p1, p2);
cursor->Clean(selpos);
cursor->Adjust();
SelClear();
@ -946,8 +947,8 @@ void MathedCursor::SelPaste()
if (selection)
SelDel();
if (selarray) {
cursor->Merge(selarray);
if (!selarray.empty()) {
cursor->Merge(&selarray);
cursor->Adjust();
}
}

2
src/mathed/math_fracinset.C
View File

@ -34,7 +34,7 @@ MathedInset * MathFracInset::Clone()
{
MathFracInset * p = new MathFracInset(*this);
// this cast will go again...
p->den_ = (MathParInset*) (p->den_->Clone());
p->den_ = static_cast<MathParInset*>(p->den_->Clone());
return p;
}

2
src/mathed/math_root.C
View File

@ -42,7 +42,7 @@ MathRootInset::~MathRootInset()
MathedInset * MathRootInset::Clone()
{
MathRootInset * p = new MathRootInset(*this);
p->uroot_ = (MathParInset *) p->uroot_->Clone();
p->uroot_ = static_cast<MathParInset *>(p->uroot_->Clone());
p->setArgumentIdx(0);
return p;
}