anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation fix; audit and fix calls to cutSelection

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7174 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-06-16 14:21:52 +00:00
parent 2a5ab60ce8
commit 260e97342e
8 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@ -56,6 +56,7 @@ src/frontends/qt2/QGraphics.C
src/frontends/qt2/QInclude.C
src/frontends/qt2/QLPrintDialog.C
src/frontends/qt2/QLog.C
src/frontends/qt2/QMath.C
src/frontends/qt2/QMathDialog.C
src/frontends/qt2/QMathMatrixDialog.C
src/frontends/qt2/QMinipage.C

29
src/ChangeLog
View File

@ -1,3 +1,14 @@
2003-06-16 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* iterators.C (operator++, ParPosition): reintroduce some
const_cast for the benefit of older compilers.
2003-06-13 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text3.C (dispatch): do not modify clipboard when doing
LFUN_BACKSPACE, LFUN_BACKSPACE_SKIP, LFUN_DELETE or
LFUN_DELETE_SKIP on a selection selection
2003-06-16 André Pönitz <poenitz@gmx.net>
* BufferView.C:
@ -2998,23 +3009,25 @@
* text.C: implement accept/rejectChange()
* lyxtext.h:
* text.C: paint changebars. Paint new/deleted text in the chosen colours.
Strike through deleted text.
* text.C: paint changebars. Paint new/deleted text in the chosen
colours. Strike through deleted text.
* paragraph.h:
* paragraph.C:
* paragraph_pimpl.h:
* paragraph_pimpl.C: output change markers in .lyx and .tex. Pass in the current change
to the insert functions. Rework erase to mark text as deleted, adding
an eraseIntern() and a range-based erase(). Implement
per-paragraph change lookup and accept/reject.
* paragraph_pimpl.C: output change markers in .lyx and .tex. Pass
in the current change to the insert functions. Rework erase to
mark text as deleted, adding an eraseIntern() and a range-based
erase(). Implement per-paragraph change lookup and
accept/reject.
* paragraph_funcs.C: Fixup paste for change tracking.
* tabular.C: mark added row/columns as new.
* text.C: fix rowLast() to never return -1. Don't allow spellchecking of deleted
text. Track transpose changes. Don't allow paragraph break or merge where appropriate.
* text.C: fix rowLast() to never return -1. Don't allow
spellchecking of deleted text. Track transpose changes. Don't
allow paragraph break or merge where appropriate.
* text2.C: leave cursor at end of selection after a cut.

3
src/insets/ChangeLog
View File

@ -1,3 +1,6 @@
2003-06-13 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insettext.C (localDispatch): fix call to cutSelection for LFUN_CUT
2003-06-16 André Pönitz <poenitz@gmx.net>

2
src/insets/insettext.C
View File

@ -1208,7 +1208,7 @@ Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
}
case LFUN_CUT: {
lt->cutSelection(bv);
lt->cutSelection(true, true);
updwhat = CURSOR_PAR;
updflag = true;
break;

6
src/iterators.C
View File

@ -47,7 +47,7 @@ public:
ParPosition::ParPosition(ParagraphList::iterator p, ParagraphList const & pl)
: pit(p), plist(&pl)
{
if (p != pl.end()) {
if (p != const_cast<ParagraphList&>(pl).end()) {
it.reset(p->insetlist.begin());
}
}
@ -129,7 +129,7 @@ ParIterator & ParIterator::operator++()
}
// Try to go to the next paragarph
if (next(p.pit) != p.plist->end()
if (next(p.pit) != const_cast<ParagraphList*>(p.plist)->end()
|| pimpl_->positions.size() == 1) {
++p.pit;
p.index.reset();
@ -253,7 +253,7 @@ ParConstIterator & ParConstIterator::operator++()
}
// Try to go to the next paragarph
if (next(p.pit) != p.plist->end()
if (next(p.pit) != const_cast<ParagraphList*>(p.plist)->end()
|| pimpl_->positions.size() == 1) {
++p.pit;
p.index.reset();

3
src/mathed/ChangeLog
View File

@ -1,3 +1,6 @@
2003-06-13 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* formulabase.C (mathDispatchCreation): fix call to cutSelection
2003-06-16 André Pönitz <poenitz@gmx.net>

2
src/mathed/formulabase.C
View File

@ -920,7 +920,7 @@ void mathDispatchCreation(FuncRequest const & cmd, bool display)
f = new InsetFormula(sel);
else
f = new InsetFormulaMacro(sel);
bv->getLyXText()->cutSelection(bv);
bv->getLyXText()->cutSelection(true, false);
openNewInset(bv, f);
}
cmd.message(N_("Math editor mode"));

10
src/text3.C
View File

@ -736,7 +736,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
// just comment out the line below...
} else {
update();
cutSelection(bv, true);
cutSelection(true, false);
update();
}
moveCursorUpdate(bv, false);
@ -777,7 +777,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
}
} else {
update();
cutSelection(bv, true);
cutSelection(true, false);
}
update();
break;
@ -794,7 +794,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
}
} else {
update();
cutSelection(bv, true);
cutSelection(true, false);
update();
}
bv->owner()->view_state_changed();
@ -823,7 +823,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
}
} else {
update();
cutSelection(bv, true);
cutSelection(true, false);
}
update();
break;
@ -1034,7 +1034,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
case LFUN_CUT:
update();
cutSelection(bv, true);
cutSelection(true, true);
update();
cmd.message(_("Cut"));
break;