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

fix free memory read when pasting + some typos

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2776 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-09-20 10:16:24 +00:00
parent ca3fd99573
commit eec568d870
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferView2.C
View File

@ -231,7 +231,7 @@ void BufferView::menuUndo()
beforeChange(text); beforeChange(text);
update(text, BufferView::SELECT|BufferView::FITCUR); update(text, BufferView::SELECT|BufferView::FITCUR);
if (!textUndo(this)) if (!textUndo(this))
owner()->message(_("No forther undo information")); owner()->message(_("No further undo information"));
else else
update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
setState(); setState();

4
src/BufferView_pimpl.C
View File

@ -2738,7 +2738,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
if (floatList.typeExist(argument)) { if (floatList.typeExist(argument)) {
insertAndEditInset(new InsetFloat(argument)); insertAndEditInset(new InsetFloat(argument));
} else { } else {
lyxerr << "Non-existant float type: " lyxerr << "Non-existent float type: "
<< argument << endl; << argument << endl;
} }
break; break;
@ -2754,7 +2754,7 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument)
else else
delete new_inset; delete new_inset;
} else { } else {
lyxerr << "Non-existant float type: " lyxerr << "Non-existent float type: "
<< argument << endl; << argument << endl;
} }

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2001-09-20 Michael Schmitt <Michael.Schmitt@teststep.org>
* several files: fix typos in user-visible strings
2001-09-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* text2.C (pasteSelection): do not set the selection, since it
will be cleared later. Actually, the intent was to fix the way the
selection was set, but I figured rmoving the code was just as good.
2001-09-19 Dekel Tsur <dekelts@tau.ac.il> 2001-09-19 Dekel Tsur <dekelts@tau.ac.il>
* FontLoader.C (available): Check if font is available without * FontLoader.C (available): Check if font is available without

2
src/insets/insetfloatlist.C
View File

@ -19,7 +19,7 @@ string const InsetFloatList::getScreenLabel(Buffer const *) const
string const res = guiName + _(" List"); string const res = guiName + _(" List");
return res; return res;
} }
return _("ERROR nonexistant float type!"); return _("ERROR: Nonexistent float type!");
} }

2
src/layout.C
View File

@ -1431,7 +1431,7 @@ bool LyXTextClassList::Read ()
lyxerr << "LyXTextClassList::Read: no textclasses found!" lyxerr << "LyXTextClassList::Read: no textclasses found!"
<< endl; << endl;
WriteAlert(_("LyX wasn't able to find any layout description!"), WriteAlert(_("LyX wasn't able to find any layout description!"),
_("Check the contents of the file \"textclass.lst\""), _("Check the contents of the file \"textclass.lst\""),
_("Sorry, has to exit :-(")); _("Sorry, has to exit :-("));
return false; return false;
} }

2
src/lyx_cb.C
View File

@ -358,7 +358,7 @@ void AutoSave(BufferView * bv)
// It is dangerous to do this in the child, // It is dangerous to do this in the child,
// but safe in the parent, so... // but safe in the parent, so...
if (pid == -1) if (pid == -1)
bv->owner()->message(_("Autosave Failed!")); bv->owner()->message(_("Autosave failed!"));
} }
} }
if (pid == 0) { // we are the child so... if (pid == 0) { // we are the child so...

4
src/text2.C
View File

@ -1839,8 +1839,8 @@ void LyXText::pasteSelection(BufferView * bview)
Paragraph * endpar; Paragraph * endpar;
Paragraph * actpar = cursor.par(); Paragraph * actpar = cursor.par();
int pos = cursor.pos(); int pos = cursor.pos();
CutAndPaste::pasteSelection(&actpar, &endpar, pos, CutAndPaste::pasteSelection(&actpar, &endpar, pos,
bview->buffer()->params.textclass); bview->buffer()->params.textclass);
@ -1849,9 +1849,7 @@ void LyXText::pasteSelection(BufferView * bview)
setCursor(bview, cursor.par(), cursor.pos()); setCursor(bview, cursor.par(), cursor.pos());
clearSelection(); clearSelection();
selection.cursor = cursor;
setCursor(bview, actpar, pos); setCursor(bview, actpar, pos);
setSelection(bview);
updateCounters(bview, cursor.row()); updateCounters(bview, cursor.row());
} }